akkartik/pensieve.love - Change JOSUB6GIULB27TORKZW7APTW5W6NQ3AYMN3BM5SSDFB7KT5P2MQQC

Merge lines.love

I've adjusted mouse_wheel_move to work even when there's no editable pane. It could be improved though. This app really wants some sense of acceleration.

I've also had to hack in a check for cursor_x/cursor_y being nil when scrolling in an editable pane.

Created by Kartik K. Agaram on March 23, 2023

JOSUB6GIULB27TORKZW7APTW5W6NQ3AYMN3BM5SSDFB7KT5P2MQQC

Dependencies

In channels

main

Change contents

Replacement in run.lua at line 704 [4.178044]
B:BD[4.183379] → [3.657:692]
```
function run.mouse_wheel_move(x,y)
```
[4.183379]
[3.692]
```
function run.mouse_wheel_move(dx,dy)
```

Replacement in run.lua at line 706 [4.178044]

B:BD[3.766] → [3.766:816]

  return edit.mouse_wheel_move(Editor_state, x,y)

[3.766]

[3.816]

  if Cursor_pane.col >= 1 then
    local pane = Surface[Cursor_pane.col][Cursor_pane.row]
    if pane then
      if pane.editable then
        if pane.cursor_x then
          edit.mouse_wheel_move(pane, dx,dy)
          plan_draw()
          return
        end
      end
    end
  end
  -- shift+scroll wheel doesn't set dx for me; manually do so if necessary
  if App.shift_down() then
    if dx == 0 then
      dx,dy = dy,dx
    end
  end
  if dy > 0 then
    for i=1,math.floor(dy) do
      pan_up()
    end
    plan_draw()
  elseif dy < 0 then
    for i=1,math.floor(-dy) do
      pan_down()
    end
    plan_draw()
  end
  if dx > 0 then
    for i=1,math.floor(dx) do
      pan_left()
    end
    plan_draw()
  elseif dx < 0 then
    for i=1,math.floor(-dx) do
      pan_right()
    end
    plan_draw()
  end

Replacement in run.lua at line 1429 [4.178044]

B:BD[5.52749] → [5.52749:53099]

    Display_settings.y = math.max(Display_settings.y - Pan_step, 0)
    local up_sy = up_edge_sy(Cursor_pane.col, Cursor_pane.row)
    local up_py = up_sy - Display_settings.y
    if up_py > 2/3*App.screen.height then
      Cursor_pane.row = math.min(#Surface[Cursor_pane.col], row(Cursor_pane.col, Display_settings.y + App.screen.height/3))
    end

[5.52749]

[5.53099]

    pan_up()

Replacement in run.lua at line 1431 [4.178044]

B:BD[5.53129] → [5.53129:53632]

    local visible_column_max_y = most(column_height, visible_columns())
    if visible_column_max_y - Display_settings.y > App.screen.height/2 then
      Display_settings.y = Display_settings.y + Pan_step
    end
    local down_sx = down_edge_sx(Cursor_pane.col, Cursor_pane.row)
    local down_px = down_sx - Display_settings.y
    if down_px < App.screen.height/3 then
      Cursor_pane.row = math.min(#Surface[Cursor_pane.col], row(Cursor_pane.col, Display_settings.y + App.screen.height/3))
    end

[5.53129]

[5.53632]

    pan_down()

Replacement in run.lua at line 1433 [4.178044]

B:BD[5.53662] → [5.53662:54138]

    Display_settings.x = math.max(Display_settings.x - Pan_step, 0)
    local left_sx = left_edge_sx(Cursor_pane.col)
    local left_px = left_sx - Display_settings.x
    if left_px > App.screen.width - Margin_right - Display_settings.column_width/2 then
      Cursor_pane.col = math.min(#Surface, col(Display_settings.x + App.screen.width - Margin_right - Display_settings.column_width/2))
      Cursor_pane.row = math.min(#Surface[Cursor_pane.col], Cursor_pane.row)
    end

[5.53662]

[5.54138]

    pan_left()

Replacement in run.lua at line 1435 [4.178044]

B:BD[5.54169] → [5.54169:54768]

    if Display_settings.x < (#Surface-1) * (Padding_horizontal + Margin_left + Display_settings.column_width + Margin_right) then
      Display_settings.x = Display_settings.x + Pan_step
    end
    local right_sx = left_edge_sx(Cursor_pane.col) + Display_settings.column_width
    local right_px = right_sx - Display_settings.x
    if right_px < Margin_left + Display_settings.column_width/2 then
      Cursor_pane.col = math.min(#Surface, col(Display_settings.x + Margin_left + Display_settings.column_width/2))
      Cursor_pane.row = math.min(#Surface[Cursor_pane.col], Cursor_pane.row)
    end

[5.54169]

[5.54768]

    pan_right()

Insertion in run.lua at line 1485 [4.178044]

[5.57512]

end
function pan_up()
  Display_settings.y = math.max(Display_settings.y - Pan_step, 0)
  local up_sy = up_edge_sy(Cursor_pane.col, Cursor_pane.row)
  local up_py = up_sy - Display_settings.y
  if up_py > 2/3*App.screen.height then
    Cursor_pane.row = math.min(#Surface[Cursor_pane.col], row(Cursor_pane.col, Display_settings.y + App.screen.height/3))
  end
end
function pan_down()
  local visible_column_max_y = most(column_height, visible_columns())
  if visible_column_max_y - Display_settings.y > App.screen.height/2 then
    Display_settings.y = Display_settings.y + Pan_step
  end
  local down_sx = down_edge_sx(Cursor_pane.col, Cursor_pane.row)
  local down_px = down_sx - Display_settings.y
  if down_px < App.screen.height/3 then
    Cursor_pane.row = math.min(#Surface[Cursor_pane.col], row(Cursor_pane.col, Display_settings.y + App.screen.height/3))
  end
end
function pan_left()
  Display_settings.x = math.max(Display_settings.x - Pan_step, 0)
  local left_sx = left_edge_sx(Cursor_pane.col)
  local left_px = left_sx - Display_settings.x
  if left_px > App.screen.width - Margin_right - Display_settings.column_width/2 then
    Cursor_pane.col = math.min(#Surface, col(Display_settings.x + App.screen.width - Margin_right - Display_settings.column_width/2))
    Cursor_pane.row = math.min(#Surface[Cursor_pane.col], Cursor_pane.row)
  end

Insertion in run.lua at line 1518 [4.178044]

[5.57517]

function pan_right()
  if Display_settings.x < (#Surface-1) * (Padding_horizontal + Margin_left + Display_settings.column_width + Margin_right) then
    Display_settings.x = Display_settings.x + Pan_step
  end
  local right_sx = left_edge_sx(Cursor_pane.col) + Display_settings.column_width
  local right_px = right_sx - Display_settings.x
  if right_px < Margin_left + Display_settings.column_width/2 then
    Cursor_pane.col = math.min(#Surface, col(Display_settings.x + Margin_left + Display_settings.column_width/2))
    Cursor_pane.row = math.min(#Surface[Cursor_pane.col], Cursor_pane.row)
  end
end

Resurrecting zombie bytes in edit.lua at line 328 [7.413]

B:B[6.6276] → [3.1864:2225]

BD:B[6.6276] → [3.1864:2225]

  end
end
function edit.mouse_wheel_move(State, dx,dy)
  if dy > 0 then
    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
    for i=1,math.floor(dy) do
      Text.up(State)
    end
  else
    State.cursor1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}
    for i=1,math.floor(-dy) do
      Text.down(State)
    end

Solving an order conflict in edit.lua at line 328 [7.413]
[2.1957]
[3.1864]

Insertion in Manual_tests.md at line 63 [11.1]

[9.791]

[10.136]

* mouse wheel up/down with/without shift key pressed when editing/not editing a maximized/unmaximized pane