akkartik/lines-cjk.love - Change FC7YAMS7UYAJ4ATQRG7P4X3EDCQR3C73U2WBD6US5AJHODAGSHWQC

resolve conflicts

Created by akkartik on June 11, 2024

FC7YAMS7UYAJ4ATQRG7P4X3EDCQR3C73U2WBD6US5AJHODAGSHWQC

Dependencies

In channels

main

Change contents

Insertion in source_text.lua at line 442 [3.83723]

[2.2593]

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

Replacement in source_text.lua at line 449 [3.83723]

B:BD[2.2781] → [2.2781:2874]

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

[2.2781]

[2.2874]

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

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

Replacement in source_text.lua at line 1109 [3.83723]

B:BD[3.145772] → [3.145772:145797]

B:BD[3.145797] → [5.5855:5879]

B:BD[5.5879] → [4.7724:7859]

∅:D[4.7859] → [5.6026:6034]

B:BD[5.6026] → [5.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),
      }

[3.145772]

[3.145985]

      State.cursor1 = Text.final_text_loc_on_screen(State)

Replacement in source_select.lua at line 72 [7.23288]
B:BD[6.4297] → [6.4297:4359]
```
  if y < State.line_cache[State.screen_top1.line].starty then
```
[6.4297]
[6.4359]
```
  if y < State.top then
```
Replacement in app.lua at line 134 [8.2]
B:BD[4.8755] → [2.9246:9278]
```
--?   test_click_moves_cursor()
```
[4.8755]
[9.842]
```
--?   test_click_below_all_lines()
```