akkartik/pensieve.love - Change X4IMZTJHZDYTKABS2SHGQWP6PN7ESECHYQQKLLGZKBDE7Y4TYX4QC

clean up

So, things I've done so far to fix up y coordinate computations:

calculate search bar height precisely
include title height and Margin_above in y calculations within a pane

Let's see how this looks.

Created by Kartik K. Agaram on August 31, 2022

X4IMZTJHZDYTKABS2SHGQWP6PN7ESECHYQQKLLGZKBDE7Y4TYX4QC

Dependencies

In channels

main

Change contents

Deletion in text.lua at line 60 [4.1]

B:BD[3.1066] → [2.3:256]

--?   local i = 10
--?   while i < App.screen.height do
--?     love.graphics.line(0,i, 300,i)
--?     love.graphics.print(tostring(i), 200, i)
--?     love.graphics.print(tostring(Display_settings.y-Header_height+i), 300, i)
--?     i = i+20
--?   end

Replacement in text.lua at line 61 [4.1]

B:BD[5.334] → [2.257:373]

      love.graphics.line(0,y, 300,y)
      love.graphics.print(tostring(y+Display_settings.y-Header_height), 300,y)

[5.334]

[6.259]

--?       love.graphics.line(0,y, 300,y)
--?       love.graphics.print(tostring(y+Display_settings.y-Header_height), 300,y)

Replacement in main.lua at line 94 [8.2]

B:BD[7.2333] → [2.531:610]

  Font_height = 10
  Line_height = Font_height  -- math.floor(Font_height*1.3)

[7.2333]

[9.8]

  Font_height = 20
  Line_height = math.floor(Font_height*1.3)

Replacement in main.lua at line 100 [8.2]

B:BD[10.85] → [2.611:658]

  print('menu height', Menu_status_bar_height)

[10.85]

--?   print('menu height', Menu_status_bar_height)

Replacement in main.lua at line 102 [8.2]

B:BD[10.130] → [2.659:713]

  print('column header height', Column_header_height)

[10.130]

--?   print('column header height', Column_header_height)

Replacement in main.lua at line 189 [8.2]

B:BD[11.356] → [2.756:797]

  print('max height', App.screen.height)

[11.356]

--?   print('max height', App.screen.height)

Deletion in main.lua at line 196 [8.2]

B:BD[11.704] → [2.798:925]

  App.screen.width, App.screen.height, App.screen.flags = love.window.getMode()
  print('viewport height2', App.screen.height)

Replacement in main.lua at line 198 [8.2]

B:BD[12.45] → [2.926:986]

  Line_height = Font_height  -- math.floor(Font_height*1.3)

[12.45]

[12.89]

  Line_height = math.floor(Font_height*1.3)

Replacement in main.lua at line 235 [8.2]

B:BD[13.84] → [2.987:1043]

  print('resize:', App.screen.width, App.screen.height)

[13.84]

--?   print('resize:', App.screen.width, App.screen.height)

Deletion in main.lua at line 773 [8.2]
B:BD[14.1736] → [2.1044:1085]
```
    print('before:', Display_settings.y)
```
Replacement in main.lua at line 815 [8.2]
B:BD[12.699] → [2.1086:1115]
```
    update_font_settings(10)
```
[12.699]
[12.745]
```
    update_font_settings(20)
```

Replacement in main.lua at line 858 [8.2]

B:BD[12.980] → [2.1116:1176]

  Line_height = font_height  -- math.floor(font_height*1.3)

[12.980]

[12.1024]

  Line_height = math.floor(font_height*1.3)

Replacement in main.lua at line 1086 [8.2]

B:BD[14.7136] → [2.1177:1751]

  print(y_of_schema1(pane, pane.cursor1))
  print('viewport starts at', Display_settings.y)
  print('pane starts at', up_edge_sy(Cursor_pane.col, Cursor_pane.row))
--?     local result = Padding_vertical
--?     for i=1,Cursor_pane.row-1 do
--?       print(i, result)
--?       local pane = Surface[Cursor_pane.col][i]
--?       result = result + Margin_above + height(pane) + Margin_below + Padding_vertical
--?     end
  print('cursor line contains ^'..pane.lines[pane.cursor1.line].data..'$')
  print('cursor is at', y_of_schema1(pane, pane.cursor1), 'from top of pane')

[14.7136]

--?   print(y_of_schema1(pane, pane.cursor1))
--?   print('viewport starts at', Display_settings.y)
--?   print('pane starts at', up_edge_sy(Cursor_pane.col, Cursor_pane.row))
--?   print('cursor line contains ^'..pane.lines[pane.cursor1.line].data..'$')
--?   print('cursor is at', y_of_schema1(pane, pane.cursor1), 'from top of pane')

Replacement in main.lua at line 1092 [8.2]
B:BD[14.7236] → [2.1752:1787]
```
  print('cursor is at', cursor_sy)
```
[14.7236]
[14.7367]
```
--?   print('cursor is at', cursor_sy)
```

Replacement in main.lua at line 1110 [8.2]

B:BD[14.8074] → [2.1788:2264]

      -- I don't understand why I need 4 line heights here.
      -- Search bar is approximately 1.5 line heights. 3 should be plenty to
      -- show the screen.
      -- Doesn't matter what column it is on screen
      print('cursor used to be at ', cursor_sy - Display_settings.y)
      local old = Display_settings.y
      print('subtract', App.screen.height, App.screen.height-Header_height)
--?       Display_settings.y = cursor_sy - (App.screen.height - Header_height)

[14.8074]

[2.2264]

--?       print('cursor used to be at ', cursor_sy - Display_settings.y)
--?       print('subtract', App.screen.height, App.screen.height-Header_height)

Replacement in main.lua at line 1113 [8.2]

B:BD[2.2370] → [2.2370:2778]

--?       Display_settings.y = cursor_sy + Line_height + Text.search_bar_height(pane) - (App.screen.height - Header_height)
      print('=>', Display_settings.y)
      print('cursor now at ', cursor_sy - Display_settings.y)
      print('viewport height', App.screen.height)
      print('cursor row starts', App.screen.height - (cursor_sy-Display_settings.y), 'px above bottom of viewport')  -- totally wrong

[2.2370]

[2.2778]

--?       print('=>', Display_settings.y)
--?       print('cursor now at ', cursor_sy - Display_settings.y)
--?       print('viewport height', App.screen.height)
--?       print('cursor row starts', App.screen.height - (cursor_sy-Display_settings.y), 'px above bottom of viewport')  -- totally wrong