akkartik/pensieve.love - Change 37AATGG5QIXOBXWA3DMSVMIIDSULA36NPETHOYZIOZ4G4RZLMHCAC

roll back experiment of commit 926c66a908 as well

scenario: paste enough text that the note needs to scroll Before this commit the cursor would end up outside the viewport and crash.

Turns out my experiments of commit 93683450a4 (Dec 24) and commit 926c66a908 (Dec 21) were connected. I need the latter precisely because I need the former.

Summary: the editor widget was originally implemented in isolation, to take over the whole window (App.screen). If it starts low down the window it assumes it's always going to have just a few lines of height to work with. That causes it to scroll too much. I have a little tweak to detect such situations and not use the editor's scrolling logic. But if I don't use the editor's scrolling logic I also shouldn't pretend I did.

Another way to put it: The decision of when to adjust the global viewport from within a single editor buffer can get intricate. We'll let it make any heuristic choices it likes as long as it communicates accurately with the outside whether it changed the global viewport.

One open question here: if I do my tweak it pans the viewport anyway. So why does it matter whether the outside does or not? There must be a discrepancy in bring_cursor_into_view that this commit is patching over. And I do see that comment in bring_cursor_into_view suggesting all is not right with it. It was introduced in commit 1ee1cbab6.

I'll come back again:

editor scrolling is jarring when editor.top is low down the screen
alternative logic using bring_cursor_of_cursor_pane_in_view
bring_cursor_of_cursor_pane_in_view has a hack to keep cursor from hiding behind search bar. But the hack is still only moving the viewport down, which should help with the above scenario.

Created by Kartik K. Agaram on December 29, 2022

37AATGG5QIXOBXWA3DMSVMIIDSULA36NPETHOYZIOZ4G4RZLMHCAC

Dependencies

In channels

main

Change contents

Replacement in run.lua at line 733 [6.178044]

∅:D[2.950] → [5.27426:27494]

B:BD[5.27426] → [5.27426:27494]

              maybe_update_screen_top_of_cursor_pane(pane, old_top)

[2.950]

[5.27494]

              local screen_top_updated = maybe_update_screen_top_of_cursor_pane(pane, old_top)

Replacement in run.lua at line 735 [6.178044]

B:BD[5.27527] → [3.74:139]

              plan_draw{preserve_screen_top_of_cursor_pane=true}

[5.27527]

[5.27553]

              plan_draw{preserve_screen_top_of_cursor_pane=screen_top_updated}

Replacement in run.lua at line 811 [6.178044]

∅:D[2.1181] → [7.804:870]

B:BD[7.804] → [7.804:870]

            maybe_update_screen_top_of_cursor_pane(pane, old_top)

[2.1181]

[7.870]

            local screen_top_updated = maybe_update_screen_top_of_cursor_pane(pane, old_top)

Replacement in run.lua at line 813 [6.178044]

B:BD[7.901] → [3.140:203]

            plan_draw{preserve_screen_top_of_cursor_pane=true}

[7.901]

[8.3123]

            plan_draw{preserve_screen_top_of_cursor_pane=screen_top_updated}

Deletion in run.lua at line 1151 [6.178044]

B:BD[5.43350] → [9.17:68]

B:BD[9.68] → [4.17:143]

  if eq(old_top, pane.screen_top1) then return end
  -- updating screen_top1 can be jarring if the pane had room above it on screen
  -- prefer to pan the surface when possible

Replacement in run.lua at line 1152 [6.178044]

B:BD[4.243] → [4.243:397]

  if eq(old_top, {line=1, pos=1}) and pane.top > Header_height and cursor_sy - Display_settings.y > App.screen.height - Header_height  - Line_height then

[4.243]

[4.397]

  if not eq(old_top, pane.screen_top1) and eq(old_top, {line=1, pos=1}) and pane.top > Header_height and cursor_sy - Display_settings.y > App.screen.height - Header_height  - Line_height then
    -- updating screen_top1 can be jarring if the pane had room above it on screen
    -- the editor widget thinks the screen is small and can scroll overly much
    -- prefer to pan the surface when possible

Replacement in run.lua at line 1161 [6.178044]

∅:D[4.614] → [9.68:294]

B:BD[9.68] → [9.68:294]

  Display_settings.y = up_edge_sy(Cursor_pane.col, Cursor_pane.row) + y_of_schema1(pane, pane.screen_top1)
  Surface.cursor_on_screen_check = true  -- cursor was on screen before keystroke, so it should remain on screen after

[4.614]

[5.44774]

  local screen_top_updated = not eq(old_top, pane.screen_top1)
  if screen_top_updated then
    Display_settings.y = up_edge_sy(Cursor_pane.col, Cursor_pane.row) + y_of_schema1(pane, pane.screen_top1)
    Surface.cursor_on_screen_check = true  -- cursor was on screen before keystroke, so it should remain on screen after
  end
  return screen_top_updated