akkartik/pensieve.love - Change B22JHH4W75CLJTHZWAHJZWYL3L7IN4MSIJSR5CCCCXYWYA27TRNQC

rip off the band-aid and get rid of the duplication in draw_normal_mode

commit 98d70859cd reintroduced a regression: the bug fixed in commit ed1dadd044. This commit doesn't actually fix anything, but is an admission that my approach so far is shit, and needs extensive surgery.

Major/recurring issues I'm currently tracking: links at bottom not consistently printing spacing between panes not always correct

panning causes title to appear only when some text is printed

panning causes text to appear

pane.top discontinuously moves in some columns as you pan

Created by Kartik K. Agaram on August 7, 2022

B22JHH4W75CLJTHZWAHJZWYL3L7IN4MSIJSR5CCCCXYWYA27TRNQC

Dependencies

In channels

main

Change contents

Insertion in main.lua at line 58 [14.2]

[13.2136]

  -- LÖVE renders N frames per second like any game engine, but we don't
  -- really need that. The only thing that animates in this app is the cursor.
  --
  -- Until I fix that, the architecture of this app will be to plan what to
  -- draw only when something changes. That way we minimize the amount of
  -- computation/power wasted on each of those frames.
  Panes_to_draw = {}  -- array of panes from surface
  Column_headers_to_draw = {}  -- strings with x coordinates

Replacement in main.lua at line 140 [14.2]
B:BD[15.153] → [15.153:176]
```
  update_pane_bounds()
```
[16.127]
[13.3863]
```
  plan_draw()
```
Replacement in main.lua at line 199 [14.2]
B:BD[17.119] → [15.177:200]
```
  update_pane_bounds()
```
[17.119]
[18.440]
```
  plan_draw()
```

Replacement in main.lua at line 232 [14.2]

B:BD[19.267] → [12.8:99]

-- keep the structure of this function sync'd with update_pane_bounds and draw_normal_mode

[19.267]

[20.39]

-- keep the structure of this function sync'd with plan_draw

Replacement in main.lua at line 271 [14.2]
B:BD[21.467] → [12.100:192]
∅:D[22.76] → [15.201:238]
∅:D[12.192] → [15.201:238]
∅:D[23.207] → [15.201:238]
∅:D[21.467] → [15.201:238]
B:BD[24.592] → [15.201:238]
```
-- keep the structure of this function sync'd with refresh_pane_height and draw_normal_mode
function update_pane_bounds(options)
```
[21.467]
[5.91]
```
-- keep the structure of this function sync'd with refresh_pane_height
function plan_draw(options)
```

Insertion in main.lua at line 274 [14.2]

[5.125]

[15.238]

  Panes_to_draw = {}
  Column_headers_to_draw = {}

Insertion in main.lua at line 279 [14.2]

[25.43]

[26.238]

      table.insert(Column_headers_to_draw, {name=column.name, x = sx-Display_settings.x})

Insertion in main.lua at line 282 [14.2]

[15.526]

[12.193]

        if sy > Display_settings.y + App.screen.height - Header_height then
          break
        end

Insertion in main.lua at line 287 [14.2]

[25.87]

[27.8]

          table.insert(Panes_to_draw, pane)

Replacement in main.lua at line 320 [14.2]

B:BD[28.148] → [28.148:169]

      pane.top = nil

[28.148]

[15.1778]

      for _, pane in ipairs(column) do
        pane.top = nil
      end

Deletion in main.lua at line 360 [14.2]

B:BD[29.112] → [12.346:440]

-- keep the structure of this function sync'd with refresh_pane_height and update_pane_bounds

Replacement in main.lua at line 365 [14.2]

∅:D[7.68] → [30.202:251]

∅:D[31.106] → [30.202:251]

∅:D[32.118] → [30.202:251]

∅:D[33.129] → [30.202:251]

∅:D[34.732] → [30.202:251]

B:BD[13.5221] → [30.202:251]

B:BD[30.251] → [25.451:486]

B:BD[13.5430] → [26.484:518]

∅:D[35.201] → [30.252:300]

∅:D[22.348] → [30.252:300]

∅:D[26.518] → [30.252:300]

B:BD[36.35] → [30.252:300]

B:BD[30.300] → [12.441:501]

∅:D[22.490] → [25.487:530]

∅:D[12.501] → [25.487:530]

B:BD[37.167] → [25.487:530]

B:BD[25.530] → [28.170:246]

B:BD[28.246] → [12.502:746]

∅:D[28.246] → [38.83:154]

∅:D[25.530] → [38.83:154]

∅:D[12.746] → [38.83:154]

B:BD[26.671] → [38.83:154]

∅:D[38.154] → [19.391:434]

B:BD[19.391] → [19.391:434]

∅:D[39.216] → [34.859:889]

B:BD[15.2031] → [34.859:889]

∅:D[40.40] → [13.5876:5902]

∅:D[41.134] → [13.5876:5902]

∅:D[42.434] → [13.5876:5902]

∅:D[22.603] → [13.5876:5902]

∅:D[34.889] → [13.5876:5902]

∅:D[15.2031] → [13.5876:5902]

B:BD[13.5876] → [13.5876:5902]

B:BD[13.5902] → [11.8:52]

∅:D[11.52] → [43.8:37]

B:BD[44.215] → [43.8:37]

∅:D[43.37] → [44.431:445]

B:BD[44.431] → [44.431:445]

∅:D[45.102] → [46.102:186]

B:BD[13.5902] → [46.102:186]

∅:D[45.140] → [30.401:453]

∅:D[46.186] → [30.401:453]

B:BD[30.401] → [30.401:453]

B:BD[30.453] → [47.121:190]

∅:D[48.225] → [40.322:427]

B:BD[40.322] → [40.322:427]

∅:D[40.427] → [30.453:527]

B:BD[30.453] → [30.453:527]

∅:D[30.527] → [49.53:225]

B:BD[49.53] → [49.53:225]

B:BD[49.225] → [8.8:91]

∅:D[8.91] → [13.5902:5914]

∅:D[49.225] → [13.5902:5914]

∅:D[50.356] → [13.5902:5914]

B:BD[13.5902] → [13.5902:5914]

B:BD[13.5914] → [51.397:477]

  for column_index, column in ipairs(Surface) do
    if should_show_column(sx) then
      local sy = Padding_vertical
      for pane_index, pane in ipairs(column) do
--?         print('draw:', column_index, pane_index, sx,sy)
        if should_show_pane(pane, sy) then
          assert(pane.top)  -- ensure we're in sync with update_pane_bounds
          -- Panes further down will include the title in their height, but
          -- the top-most pane needs a special case.
          if pane_index == 1 and column[pane_index].title then
            sy = sy + 5+Line_height+5
          end
          if pane.title and eq(pane.screen_top1, {line=1, pos=1}) then
            draw_title(pane)
          end
          pane.cursor_y = nil
          edit.draw(pane)
          if pane_drew_to_bottom(pane) then
            draw_links(pane)
          end
          if column_index == Cursor_pane.col and pane_index == Cursor_pane.row then
            App.color(Cursor_pane_background_color)
            if pane.editable and Surface.cursor_on_screen_check then
              assert(pane.cursor_y)
              Surface.cursor_on_screen_check = false
            end
          else
            App.color(Pane_background_color)
          end
          love.graphics.rectangle('fill', pane.left-Margin_left,pane.top-Margin_above, pane.width+Margin_left+Margin_right, pane.bottom-pane.top+Margin_above+Margin_below)
          if pane.bottom >= App.screen.height then
            break
          end
        end
        sy = sy + Margin_above + height(pane) + Margin_below + Padding_vertical

[7.68]

[13.5952]

  for _,pane in ipairs(Panes_to_draw) do
    assert(pane.top)
    if pane.title and eq(pane.screen_top1, {line=1, pos=1}) then
      draw_title(pane)
    end
    pane.cursor_y = nil
    edit.draw(pane)
    if pane_drew_to_bottom(pane) then
      draw_links(pane)
    end
    if column_index == Cursor_pane.col and pane_index == Cursor_pane.row then
      App.color(Cursor_pane_background_color)
      if pane.editable and Surface.cursor_on_screen_check then
        assert(pane.cursor_y)
        Surface.cursor_on_screen_check = false

Insertion in main.lua at line 381 [14.2]

[13.5962]

    else
      App.color(Pane_background_color)

Insertion in main.lua at line 384 [14.2]

[13.5970]

[52.54]

    love.graphics.rectangle('fill', pane.left-Margin_left,pane.top-Margin_above, pane.width+Margin_left+Margin_right, pane.bottom-pane.top+Margin_above+Margin_below)
  end
  for _,header in ipairs(Column_headers_to_draw) do

Replacement in main.lua at line 389 [14.2]

B:BD[52.110] → [53.370:549]

    love.graphics.rectangle('fill', sx-Display_settings.x - Margin_left, Menu_status_bar_height, Margin_left + Display_settings.column_width + Margin_right, Column_header_height)

[52.110]

[52.260]

    love.graphics.rectangle('fill', header.x - Margin_left, Menu_status_bar_height, Margin_left + Display_settings.column_width + Margin_right, Column_header_height)

Replacement in main.lua at line 391 [14.2]

B:BD[52.286] → [53.550:636]

∅:D[53.636] → [35.766:860]

B:BD[35.766] → [35.766:860]

    love.graphics.print(column.name, sx-Display_settings.x, Menu_status_bar_height+5)
    sx = sx + Margin_right + Display_settings.column_width + Padding_horizontal + Margin_left

[52.286]

[11.53]

    love.graphics.print(header.name, header.x, Menu_status_bar_height+5)

Replacement in main.lua at line 506 [14.2]
∅:D[5.265] → [15.2032:2057]
B:BD[54.550] → [15.2032:2057]
```
    update_pane_bounds()
```
[5.265]
[54.575]
```
    plan_draw()
```

Replacement in main.lua at line 710 [14.2]

B:BD[55.339] → [55.339:396]

    update_pane_bounds{ignore_editable_cursor_pane=true}

[55.339]

[56.930]

    plan_draw{ignore_editable_cursor_pane=true}

Replacement in main.lua at line 736 [14.2]
B:BD[57.256] → [58.37:60]
```
  update_pane_bounds()
```
[57.256]
[59.1349]
```
  plan_draw()
```
Replacement in main.lua at line 1013 [14.2]
B:BD[60.1959] → [6.8:31]
```
  update_pane_bounds()
```
[60.1959]
[60.1959]
```
  plan_draw()
```
Replacement in commands.lua at line 440 [62.39]
∅:D[9.46] → [61.168:191]
∅:D[63.343] → [61.168:191]
B:BD[64.357] → [61.168:191]
```
  update_pane_bounds()
```
[9.46]
[64.357]
```
  plan_draw()
```
Replacement in commands.lua at line 450 [62.39]
B:BD[65.54] → [2.18:43]
```
    update_pane_bounds()
```
[65.54]
[66.90]
```
    plan_draw()
```
Replacement in commands.lua at line 477 [62.39]
B:BD[67.105] → [67.105:128]
```
  update_pane_bounds()
```
[67.105]
[68.654]
```
  plan_draw()
```
Replacement in commands.lua at line 485 [62.39]
B:BD[67.216] → [67.216:239]
```
  update_pane_bounds()
```
[67.216]
[68.882]
```
  plan_draw()
```
Replacement in commands.lua at line 493 [62.39]
B:BD[67.327] → [67.327:350]
```
  update_pane_bounds()
```
[67.327]
[69.274]
```
  plan_draw()
```
Replacement in commands.lua at line 501 [62.39]
B:BD[67.438] → [57.417:440]
```
  update_pane_bounds()
```
[67.438]
[57.440]
```
  plan_draw()
```
Replacement in commands.lua at line 513 [62.39]
∅:D[57.575] → [67.438:461]
B:BD[67.438] → [67.438:461]
```
  update_pane_bounds()
```
[57.575]
[68.1363]
```
  plan_draw()
```
Replacement in commands.lua at line 525 [62.39]
B:BD[57.709] → [57.709:732]
```
  update_pane_bounds()
```
[57.709]
[57.732]
```
  plan_draw()
```
Replacement in commands.lua at line 557 [62.39]
B:BD[70.486] → [4.18:41]
```
  update_pane_bounds()
```
[70.486]
[71.781]
```
  plan_draw()
```
Replacement in commands.lua at line 565 [62.39]
∅:D[65.95] → [72.666:689]
B:BD[72.666] → [72.666:689]
```
  update_pane_bounds()
```
[65.95]
[73.116]
```
  plan_draw()
```
Replacement in commands.lua at line 581 [62.39]
B:BD[74.343] → [3.18:41]
```
  update_pane_bounds()
```
[74.343]
[72.689]
```
  plan_draw()
```
Replacement in commands.lua at line 603 [62.39]
∅:D[75.90] → [61.192:215]
∅:D[9.115] → [61.192:215]
∅:D[65.136] → [61.192:215]
∅:D[72.1528] → [61.192:215]
B:BD[70.860] → [61.192:215]
```
  update_pane_bounds()
```
[9.115]
[70.860]
```
  plan_draw()
```
Replacement in commands.lua at line 642 [62.39]
∅:D[65.171] → [76.999:1022]
B:BD[76.999] → [76.999:1022]
```
  update_pane_bounds()
```
[65.171]
[77.409]
```
  plan_draw()
```
Replacement in commands.lua at line 704 [62.39]
B:BD[78.1547] → [78.1547:1570]
```
  update_pane_bounds()
```
[78.1499]
[79.234]
```
  plan_draw()
```
Replacement in commands.lua at line 720 [62.39]
B:BD[80.1278] → [80.1278:1301]
```
  update_pane_bounds()
```
[80.1278]
[80.1301]
```
  plan_draw()
```
Replacement in commands.lua at line 744 [62.39]
B:BD[81.405] → [10.56:79]
```
  update_pane_bounds()
```
[81.405]
[81.405]
```
  plan_draw()
```

rip off the band-aid and get rid of the duplication in draw_normal_mode

Dependencies

In channels

Change contents

Insertion in main.lua at line 58 [14.2]

Replacement in main.lua at line 140 [14.2]

Replacement in main.lua at line 199 [14.2]

Replacement in main.lua at line 232 [14.2]

Replacement in main.lua at line 271 [14.2]

Insertion in main.lua at line 274 [14.2]

Insertion in main.lua at line 279 [14.2]

Insertion in main.lua at line 282 [14.2]

Insertion in main.lua at line 287 [14.2]

Replacement in main.lua at line 320 [14.2]

Deletion in main.lua at line 360 [14.2]

Replacement in main.lua at line 365 [14.2]

Insertion in main.lua at line 381 [14.2]

Insertion in main.lua at line 384 [14.2]

Replacement in main.lua at line 389 [14.2]

Replacement in main.lua at line 391 [14.2]

Replacement in main.lua at line 506 [14.2]

Replacement in main.lua at line 710 [14.2]

Replacement in main.lua at line 736 [14.2]

Replacement in main.lua at line 1013 [14.2]

Replacement in commands.lua at line 440 [62.39]

Replacement in commands.lua at line 450 [62.39]

Replacement in commands.lua at line 477 [62.39]

Replacement in commands.lua at line 485 [62.39]

Replacement in commands.lua at line 493 [62.39]

Replacement in commands.lua at line 501 [62.39]

Replacement in commands.lua at line 513 [62.39]

Replacement in commands.lua at line 525 [62.39]

Replacement in commands.lua at line 557 [62.39]

Replacement in commands.lua at line 565 [62.39]

Replacement in commands.lua at line 581 [62.39]

Replacement in commands.lua at line 603 [62.39]

Replacement in commands.lua at line 642 [62.39]

Replacement in commands.lua at line 704 [62.39]

Replacement in commands.lua at line 720 [62.39]

Replacement in commands.lua at line 744 [62.39]