akkartik/lines-and-links - Change E3FCMID7RMYSRNSJHSSZ7I5NLYNXPXAWSWYHEK6ZJHZB7775HQ6AC

resolve conflicts

Created by akkartik on June 11, 2024

E3FCMID7RMYSRNSJHSSZ7I5NLYNXPXAWSWYHEK6ZJHZB7775HQ6AC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text.lua at line 20 [5.1]

B:B[4.363] → [2.3:191]

BD:B[4.363] → [2.3:191]

      local screen_line = Text.screen_line(line, line_cache, i)
--?       print('text.draw:', screen_line, 'at', line_index,pos, 'after', x,y)
      local frag_len = utf8.len(screen_line)

Insertion in source_text.lua at line 442 [7.83723]

[3.2593]

    if State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing_padding_top
    end

Replacement in source_text.lua at line 449 [7.83723]

B:BD[3.2781] → [3.2781:2874]

      y = y + Drawing_padding_height + Drawing.pixels(State.lines[loc2.line].h, State.width)

[3.2781]

[3.2874]

      y = y + Drawing.pixels(State.lines[loc2.line].h, State.width) + Drawing_padding_bottom

Deletion in source_text.lua at line 1108 [7.83723]
∅:D[6.7723] → [7.145702:145727]
B:BD[7.145702] → [7.145702:145727]
```
--?     print('too low')
```

Replacement in source_text.lua at line 1109 [7.83723]

B:BD[7.145772] → [7.145772:145797]

B:BD[7.145797] → [8.5855:5879]

B:BD[8.5879] → [6.7724:7859]

∅:D[6.7859] → [8.6026:6034]

B:BD[8.6026] → [8.6026:6034]

--?       print('tweak')
      State.cursor1 = {
          line=screen_bottom1.line,
          pos=Text.to_pos_on_line(State, screen_bottom1.line, State.right-5, App.screen.height-5),
      }

[7.145772]

[7.145985]

      State.cursor1 = Text.final_text_loc_on_screen(State)

Replacement in source_select.lua at line 72 [10.23288]
B:BD[9.4297] → [9.4297:4359]
```
  if y < State.line_cache[State.screen_top1.line].starty then
```
[9.4297]
[9.4359]
```
  if y < State.top then
```
Replacement in app.lua at line 134 [11.2]
B:BD[6.8755] → [3.9246:9278]
```
--?   test_click_moves_cursor()
```
[6.8755]
[12.842]
```
--?   test_click_below_all_lines()
```