akkartik/techmeet.love - Change F5FZLXTS63V6GG6RMKSZS3X4BPADVZY436VGVYKHALTIYUB6M65QC

Merge upstream into main

Bugfix: we can now edit drawings again.

Now that I notice I can leave notes in merge commits, I should also mention that the merge of commit ecba6525820 fixed the problem mentioned in 0b7dbadfe5.

It's a luxury to be able to fix things upstream. Next time I should try fixing a change like these downstream, and backport it upstream. That would match somebody else's experience with the network of forks I've been proposing for years.

Created by Kartik K. Agaram on July 20, 2022

F5FZLXTS63V6GG6RMKSZS3X4BPADVZY436VGVYKHALTIYUB6M65QC

Dependencies

In channels

main

Change contents

Replacement in main.lua at line 152 [7.2]
B:BD[6.112] → [3.197:225]
```
  file.text_line_cache = {}
```
[6.112]
[3.225]
```
  file.line_cache = {}
```
Replacement in main.lua at line 155 [7.2]
B:BD[3.281] → [3.281:314]
```
    file.text_line_cache[i] = {}
```
[3.281]
[8.3962]
```
    file.line_cache[i] = {}
```

Replacement in main.lua at line 161 [7.2]

B:BD[3.407] → [3.407:483]

      y = y + Line_height*#file.text_line_cache[i].screen_line_starting_pos

[3.407]

[8.4222]

      y = y + Line_height*#file.line_cache[i].screen_line_starting_pos

Replacement in main.lua at line 186 [7.2]

B:BD[3.611] → [3.611:674]

  result.text_line_cache = deepcopy(Cache[id].text_line_cache)

[3.611]

[8.4881]

  result.line_cache = deepcopy(Cache[id].line_cache)

Deletion in edit.lua at line 227 [9.413]

B:BD[9.8089] → [4.569:660]

      if State.show_cursor and Drawing.in_drawing(line, x, y, State.left,State.right) then

Replacement in edit.lua at line 228 [9.413]

B:BD[5.111] → [5.111:192]

      if Drawing.in_drawing(line, line_cache, x, y, State.left,State.right) then

[5.111]

[10.5145]

      if State.show_cursor and Drawing.in_drawing(line, line_cache, x, y, State.left,State.right) then

Replacement in drawing.lua at line 12 [12.98]

B:BD[11.1580] → [2.17:137]

B:BD[11.1580] → [5.1659:1779]

  if State.show_cursor and pmx < State.right and pmy > line.y and pmy < line.y+Drawing.pixels(line.h, State.width) then
  if pmx < State.right and pmy > line_cache.starty and pmy < line_cache.starty+Drawing.pixels(line.h, State.width) then

[11.1580]

[13.1026]

  if State.show_cursor and pmx < State.right and pmy > line_cache.starty and pmy < line_cache.starty+Drawing.pixels(line.h, State.width) then