akkartik/sokoban.love - Change MZ3DMYPD4LSSQKEA3GNI5MK2QNTJ523DTNG6DUPWEWLH4FLUIQSAC

start sketching out a scrollbar

Not quite ideal: the scrollbar computation only considers screen_bottom1.line and not screen_bottom1.pos, and so it always assumes the final line is at the bottom of the screen.

I'm making a deeper change here that I might come to regret. I want to avoid creating new book-keeping for editor mutations, so I'm putting the work of computing scrollbar data into clear_screen_line_cache. But that implies the editor should never clear before updating data, and I caught one place that wasn't true before. A better name helps avoid this in future. Let's see how much toil this causes in resolving conflicts.

Created by akkartik on November 18, 2023

MZ3DMYPD4LSSQKEA3GNI5MK2QNTJ523DTNG6DUPWEWLH4FLUIQSAC

Dependencies

In channels

main

Change contents

Insertion in text.lua at line 31 [7.1]
[5.363]
[6.3]
```
--?       print(i)
```
Replacement in text.lua at line 170 [7.1]
B:BD[8.2204] → [9.4:4]
∅:D[9.4] → [10.3:61]
∅:D[11.2113] → [10.3:61]
∅:D[8.2204] → [10.3:61]
B:BD[12.344] → [10.3:61]
```
  Text.clear_screen_line_cache(State, State.cursor1.line)
```
[8.2204]
[12.396]
```
  Text.refresh_screen_line_cache(State, State.cursor1.line)
```

Replacement in text.lua at line 239 [7.1]

B:BD[13.3000] → [10.62:122]

    Text.clear_screen_line_cache(State, State.cursor1.line)

[13.3000]

[14.2810]

    Text.refresh_screen_line_cache(State, State.cursor1.line)

Replacement in text.lua at line 272 [7.1]

B:BD[13.3922] → [10.123:183]

    Text.clear_screen_line_cache(State, State.cursor1.line)

[13.3922]

[15.137]

    Text.refresh_screen_line_cache(State, State.cursor1.line)

Replacement in text.lua at line 367 [7.1]
∅:D[11.3889] → [10.184:242]
∅:D[8.3973] → [10.184:242]
B:BD[12.2389] → [10.184:242]
```
  Text.clear_screen_line_cache(State, State.cursor1.line)
```
[8.3973]
[16.121]
```
  Text.refresh_screen_line_cache(State, State.cursor1.line)
```
Insertion in text.lua at line 933 [7.1]
[17.1637]
[18.7399]
```
  local curr_screen_line_index = 1
```

Insertion in text.lua at line 936 [7.1]

[17.1667]

[19.2910]

    State.line_cache[i].start_screen_line_index = curr_screen_line_index
    Text.populate_screen_line_starting_pos(State, i)
    curr_screen_line_index = curr_screen_line_index + #State.line_cache[i].screen_line_starting_pos

Insertion in text.lua at line 940 [7.1]

[19.2916]

  State.screen_line_count = curr_screen_line_index-1

Replacement in text.lua at line 943 [7.1]

B:BD[19.2921] → [10.405:462]

function Text.clear_screen_line_cache(State, line_index)

[19.2921]

[17.1715]

function Text.refresh_scrollbar_data(State)
--?   print('clearing fragments')
  local curr_screen_line_index = 1
  local npopulated = 0
  for i=1,#State.lines do
    if State.line_cache[i] == nil then
      State.line_cache[i] = {}
    end
    if State.line_cache[i].screen_line_starting_pos == nil then
--?       print(('refresh_scrollbar_data: populating line %d'):format(i))
      Text.populate_screen_line_starting_pos(State, i)
      npopulated = npopulated+1
    end
    State.line_cache[i].start_screen_line_index = curr_screen_line_index
    curr_screen_line_index = curr_screen_line_index + #State.line_cache[i].screen_line_starting_pos
  end
  if npopulated > 1 then
    print(('refresh_scrollbar_data: had to populate %d lines'):format(npopulated))
  end
  State.screen_line_count = curr_screen_line_index-1
end
function Text.refresh_screen_line_cache(State, line_index)

Insertion in text.lua at line 967 [7.1]

[17.1777]

[2.3]

  Text.populate_screen_line_starting_pos(State, line_index)
  Text.refresh_scrollbar_data(State)

Deletion in select.lua at line 120 [20.43980]
B:BD[20.47298] → [10.564:608]
```
  Text.clear_screen_line_cache(State, minl)
```
Insertion in select.lua at line 125 [20.43980]
[8.6567]
[20.47635]
```
    Text.refresh_screen_line_cache(State, minl)
```
Insertion in select.lua at line 135 [20.43980]
[8.6698]
[20.47844]
```
  Text.refresh_screen_line_cache(State, minl)
```

Insertion in edit.lua at line 32 [21.413]

[18.8245]

[17.1829]

    --   start_screen_line_index: a count of the number of screen lines above this line

Insertion in Manual_tests.md at line 16 [22.1]

[3.26]

* Type out a wrapping line, select all using ctrl+a and delete. Editor does
  not crash.

File addition: 0035-compute_scrollbar (----------)

[23.2]

-- returns:
-- 	* a float between 0 and 1 regarding the relative position of the top line on screen
--     * a float between 0 and 1 regarding the relative position of the bottom line on screen
compute_scrollbar = function(state)
	local top = state.line_cache[state.screen_top1.line].start_screen_line_index
	local bot = state.line_cache[state.screen_bottom1.line].start_screen_line_index
	return (top-1)/state.screen_line_count, bot/state.screen_line_count
end

File addition: 0034-draw_scrollbar (----------)

[23.2]

draw_scrollbar = function(Editor_state)
	App.color(Normal_color)
	love.graphics.line(Editor_state.right+30, Editor_state.top, Editor_state.right+30, Editor_state.bottom)
	love.graphics.line(Editor_state.right+25, Editor_state.top, Editor_state.right+35, Editor_state.top)
	love.graphics.line(Editor_state.right+25, Editor_state.bottom, Editor_state.right+35, Editor_state.bottom)
	local sbtop, sbbot = compute_scrollbar(Editor_state)
	local topy = Editor_state.top + sbtop*(Editor_state.bottom - Editor_state.top)
	local boty = Editor_state.top +sbbot*(Editor_state.bottom - Editor_state.top)
	App.color{r=0.6, g=0.6, b=0.8, a=0.5}
	love.graphics.rectangle('fill', Editor_state.right+20, topy, 20, boty-topy)
end

Replacement in 0013-on.keychord_press at line 11 [24.2758]
∅:D[4.2303] → [24.2847:2850]
B:BD[24.2847] → [24.2847:2850]
```
end
```
[4.2303]
```
end
```
Insertion in 0012-on.draw at line 6 [24.2899]
[24.3033]
[25.1925]
```
	draw_scrollbar(Editor_state)
```

start sketching out a scrollbar

Dependencies

In channels

Change contents

Insertion in text.lua at line 31 [7.1]

Replacement in text.lua at line 170 [7.1]

Replacement in text.lua at line 239 [7.1]

Replacement in text.lua at line 272 [7.1]

Replacement in text.lua at line 367 [7.1]

Insertion in text.lua at line 933 [7.1]

Insertion in text.lua at line 936 [7.1]

Insertion in text.lua at line 940 [7.1]

Replacement in text.lua at line 943 [7.1]

Insertion in text.lua at line 967 [7.1]

Deletion in select.lua at line 120 [20.43980]

Insertion in select.lua at line 125 [20.43980]

Insertion in select.lua at line 135 [20.43980]

Insertion in edit.lua at line 32 [21.413]

Insertion in Manual_tests.md at line 16 [22.1]

File addition: 0035-compute_scrollbar (----------)

File addition: 0034-draw_scrollbar (----------)

Replacement in 0013-on.keychord_press at line 11 [24.2758]

Insertion in 0012-on.draw at line 6 [24.2899]