akkartik/lines-polygon-experiment - Change OEUU62GMV5NDJTICRKJSGKG3TO5DJIPY6CQZNNP53MK737X3KG6QC

Merge upstream into main

Created by Kartik K. Agaram on July 1, 2022

OEUU62GMV5NDJTICRKJSGKG3TO5DJIPY6CQZNNP53MK737X3KG6QC

Dependencies

In channels

main

Change contents

Deletion in text_tests.lua at line 263 [12.2]
B:BD[11.208] → [11.208:248]
BD:BD[11.208] → [11.208:248]
```
  App.screen.init{width=200, height=80}
```

Resurrecting zombie bytes in text_tests.lua at line 264 [12.2]

∅:∅[13.202] → [11.248:404]

B:B[11.248] → [11.248:404]

BD:B[11.248] → [11.248:404]

                   -- 0        1         2
                   -- 123456789012345678901
  Lines = load_array{'the quick brown fox jumped over the lazy dog'}

Deletion in text_tests.lua at line 267 [12.2]
B:BD[11.404] → [11.404:423]
BD:BD[11.404] → [11.404:423]
```
  Line_width = 160
```
Resurrecting zombie bytes in text_tests.lua at line 267 [12.2]
B:B[11.404] → [9.722:769]
BD:B[11.404] → [9.722:769]
```
  Margin_right = 0; Margin_width = Margin_left
```

Resurrecting zombie bytes in text_tests.lua at line 268 [12.2]

∅:∅[9.769] → [11.423:676]

B:B[11.423] → [11.423:676]

BD:B[11.423] → [11.423:676]

  Cursor1 = {line=1, pos=1}
  Screen_top1 = {line=1, pos=1}
  Screen_bottom1 = {}
  App.draw()
  local y = Margin_top
  App.screen.check(y, 'the quick brown fox ', 'F - test_click_past_end_of_word_wrapping_line/baseline/screen:1')
  y = y + Line_height

Deletion in text_tests.lua at line 275 [12.2]
B:BD[11.676] → [11.676:741]
BD:BD[11.676] → [11.676:741]
B:BD[11.741] → [11.741:754]
BD:BD[11.741] → [11.741:754]
BD:BD[11.741] → [11.741:754]
B:BD[11.754] → [11.754:803]
BD:BD[11.754] → [11.754:803]
BD:BD[11.754] → [11.754:803]
```
  -- click past the end of the screen line but within Line_width
  App.draw()
  App.run_after_mouse_click(Line_width-2,y-2, 1)
```
Resurrecting zombie bytes in text_tests.lua at line 277 [12.2]
∅:∅[13.301] → [11.803:927]
B:B[11.803] → [11.803:927]
BD:B[11.803] → [11.803:927]
BD:B[11.803] → [11.803:927]
```
  -- cursor moves to end of screen line
  check_eq(Cursor1.pos, 20, 'F - test_click_past_end_of_word_wrapping_line/cursor')
```
Deletion in text.lua at line 676 [16.1]
B:BD[14.133] → [15.740:836]
BD:BD[14.133] → [15.740:836]
B:BD[15.836] → [18.20:20]
```
      local screen_line_starting_byte_offset = Text.offset(line.data, screen_line_starting_pos)
```

Deletion in main_tests.lua at line 68 [19.7]

B:BD[4.1865] → [4.1865:1870]

∅:D[4.1870] → [19.552:751]

B:BD[19.552] → [19.552:751]

B:BD[19.751] → [20.77:153]

∅:D[20.153] → [19.851:1120]

B:BD[19.851] → [19.851:1120]

end
function test_adjust_line_width()
  io.write('\ntest_adjust_line_width')
  Filename = 'foo'
  App.screen.init{width=Margin_left+300, height=300}
  Line_width = 256
  App.draw()  -- initialize button
  App.run_after_mouse_press(256, Margin_top-3, 1)
  App.mouse_move(200, 37)
  -- no change for some time
  App.wait_fake_time(0.01)
  App.update(0)
  check_eq(Line_width, 256, 'F - test_adjust_line_width/early')
  -- after 0.1s the change takes
  App.wait_fake_time(0.1)
  App.update(0)
  check_eq(Line_width, 200, 'F - test_adjust_line_width')

Deletion in main.lua at line 106 [22.2]
B:BD[21.8] → [21.8:55]
B:BD[21.55] → [18.33:33]
BD:BD[21.55] → [18.33:33]
```
-- line-width indicator
Line_width_hover = nil
```
Deletion in main.lua at line 195 [22.2]
B:BD[23.217] → [24.154:189]
B:BD[24.189] → [18.35:35]
```
  Last_resize_time = App.getTime()
```
Resurrecting zombie bytes in main.lua at line 195 [22.2]
B:B[23.217] → [10.1274:1380]
BD:B[23.217] → [10.1274:1380]
```
  Selection1 = {}  -- no support for shift drag while we're resizing
  Text.tweak_screen_top_and_cursor()
```
Insertion in main.lua at line 197 [22.2]
[10.1380]
[25.690]
```
  Last_resize_time = App.getTime()
```
Deletion in main.lua at line 231 [22.2]
B:BD[22.336] → [23.260:261]
Deletion in main.lua at line 232 [22.2]
B:BD[21.274] → [18.37:37]
BD:BD[21.274] → [18.37:37]
Solving an order conflict in main.lua at line 232 [22.2]
[21.274]
[8.1144]
Deletion in main.lua at line 315 [22.2]
B:BD[24.609] → [26.8:45]
```
-- make sure to save before quitting
```
Deletion in main.lua at line 316 [22.2]
B:BD[26.66] → [4.1873:1873]
Resurrecting zombie bytes in main.lua at line 316 [22.2]
B:B[27.66] → [7.8:47]
BD:B[27.66] → [7.8:47]
```
  -- make sure to save before quitting
```
Solving an order conflict in main.lua at line 316 [22.2]
[26.66]
[7.8]

Insertion in main.lua at line 320 [22.2]

[28.68]

[4.1874]

  -- save some important settings
  local x,y,displayindex = love.window.getPosition()
  local settings = {
    x=x, y=y, displayindex=displayindex,
    width=App.screen.width, height=App.screen.height,
    font_height=Font_height, filename=Filename, screen_top=Screen_top1, cursor=Cursor1}
  love.filesystem.write('config', json.encode(settings))

Deletion in main.lua at line 334 [22.2]

B:BD[29.2] → [21.707:877]

  -- we seem to sometimes get phantom clicks if the mouse moves down into text while adjusting line-width
  if Line_width_hover then
    Selection1 = {}
    return
  end

Deletion in main.lua at line 350 [22.2]
B:BD[30.2422] → [31.738:769]
B:BD[31.769] → [18.49:49]
```
--?         print('selection')
```

Deletion in main.lua at line 569 [22.2]

B:BD[28.68] → [7.48:396]

BD:BD[28.68] → [7.48:396]

  -- save some important settings
  local x,y,displayindex = love.window.getPosition()
  local settings = {
    x=x, y=y, displayindex=displayindex,
    width=App.screen.width, height=App.screen.height,
    font_height=Font_height, filename=Filename, screen_top=Screen_top1, cursor=Cursor1}
  love.filesystem.write('config', json.encode(settings))

Solving an order conflict in main.lua at line 569 [22.2]
[32.331]

Replacement in drawing_tests.lua at line 196 [34.15]

B:BD[33.1415] → [33.1415:1468]

  App.screen.init{width=Margin_left+300, height=300}

[33.1415]

[33.1468]

  App.screen.init{width=Margin_width+256, height=300}  -- drawing coordinates 1:1 with pixels

Deletion in drawing_tests.lua at line 198 [34.15]
B:BD[33.1512] → [2.15:86]
```
  Line_width = Margin_left+256  -- drawing coordinates 1:1 with pixels
```
Deletion in drawing_tests.lua at line 469 [34.15]
B:BD[35.2844] → [9.6095:6189]
BD:BD[35.2844] → [9.6095:6189]
```
  App.screen.init{width=Margin_width+256, height=300}  -- drawing coordinates 1:1 with pixels
```

Deletion in drawing_tests.lua at line 600 [34.15]

B:BD[35.4357] → [9.6190:6284]

BD:BD[35.4357] → [9.6190:6284]

B:BD[37.7265] → [9.5525:5619]

BD:BD[37.7265] → [9.5525:5619]

B:BD[37.847] → [9.5240:5334]

BD:BD[37.847] → [9.5240:5334]

  App.screen.init{width=Margin_width+256, height=300}  -- drawing coordinates 1:1 with pixels
  App.screen.init{width=Margin_width+256, height=300}  -- drawing coordinates 1:1 with pixels
  App.screen.init{width=Margin_width+256, height=300}  -- drawing coordinates 1:1 with pixels

Solving an order conflict in drawing_tests.lua at line 600 [34.15]
[39.2215]

Merge upstream into main

Dependencies

In channels

Change contents

Deletion in text_tests.lua at line 263 [12.2]

Resurrecting zombie bytes in text_tests.lua at line 264 [12.2]

Deletion in text_tests.lua at line 267 [12.2]

Resurrecting zombie bytes in text_tests.lua at line 267 [12.2]

Resurrecting zombie bytes in text_tests.lua at line 268 [12.2]

Deletion in text_tests.lua at line 275 [12.2]

Resurrecting zombie bytes in text_tests.lua at line 277 [12.2]

Deletion in text.lua at line 676 [16.1]

Deletion in main_tests.lua at line 68 [19.7]

Deletion in main.lua at line 106 [22.2]

Deletion in main.lua at line 195 [22.2]

Resurrecting zombie bytes in main.lua at line 195 [22.2]

Insertion in main.lua at line 197 [22.2]

Deletion in main.lua at line 231 [22.2]

Deletion in main.lua at line 232 [22.2]

Solving an order conflict in main.lua at line 232 [22.2]

Deletion in main.lua at line 315 [22.2]

Deletion in main.lua at line 316 [22.2]

Resurrecting zombie bytes in main.lua at line 316 [22.2]

Solving an order conflict in main.lua at line 316 [22.2]

Insertion in main.lua at line 320 [22.2]

Deletion in main.lua at line 334 [22.2]

Deletion in main.lua at line 350 [22.2]

Deletion in main.lua at line 569 [22.2]

Solving an order conflict in main.lua at line 569 [22.2]

Replacement in drawing_tests.lua at line 196 [34.15]

Deletion in drawing_tests.lua at line 198 [34.15]

Deletion in drawing_tests.lua at line 469 [34.15]

Deletion in drawing_tests.lua at line 600 [34.15]

Solving an order conflict in drawing_tests.lua at line 600 [34.15]