keep drawings within the line width slider as well

[?]

Jun 23, 2022, 4:08 AM

C45WCXJ26DEQSZ2WXUT2XKNZGK3C25B3EUIUYXA3S5QJJGNKP2NAC

Dependencies

[2] ZZ2B5RPQ extract variables for drawing padding
[3] 4AXV2HG4 all pending manual tests done!
[4] NHA7RUFI move current mode indicator slightly
[5] LYN3L74W correct commit f3abc2cbf2
[6] XNFTJHC4 split keyboard handling between Text and Drawing
[7] JFFUF5AL override mouse state lookups in tests
[8] L6XA5EY2 test: moving a point
[9] VHQCNMAR several more modules
[10] CRYGI3LR more drawing tests
[11] LAW2O3NW extract variable Margin_left
[12] BLWAYPKV extract a module
[13] 7DYUAOI6 test: undo moving point
[14] 7CLGG7J2 test: autosave after any shape
[15] DLQMM265 scroll past first page
[16] YJGADSGK delete unused arg
[17] 7DPPMI2U another integer coordinate
[18] 42LVB4DE test: naming a point
[19] LUNH47XX make text and drawings the same width
[20] K2X6G75Z start writing some tests for drawings
[21] Y4VYNEGF test: autosave after name/move/delete of point
[22] LXTTOB33 extract a couple of files
[23] HYEAFRZ2 split mouse_pressed events between Text and Drawing
[24] KAUD3YIK tests: deleting points/shapes
[25] T7SJSJIH test: undo naming a point
[26] T3B4NLV3 include a unit test
[27] PX7DDEMO autosave slightly less aggressively
[28] OWK3U6VD tests for drawing polygons

Change contents

replacement in text_tests.lua at line 533

[6.7255]→[6.7255:7294](∅→∅)

App.screen.init{width=50, height=80}

[6.7255]

[6.7294]

local drawing_width = 50
App.screen.init{width=Margin_left+drawing_width, height=80}
replacement in text_tests.lua at line 544

[6.7716]→[2.2:85](∅→∅)

local drawing_height = Drawing_padding_height + App.screen.width / 2 -- default

[6.7716]

[6.7779]

local drawing_height = Drawing_padding_height + drawing_width/2 -- default
replacement in drawing_tests.lua at line 29

[6.450]→[6.450:509](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.450]

[6.509]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 73

[6.410]→[6.410:469](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.410]

[6.469]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 101

[6.2013]→[6.2013:2072](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.2013]

[6.2072]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 129

[6.3597]→[6.3597:3656](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.3597]

[6.3656]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 145

[6.4374]→[6.4374:4433](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.4374]

[6.4433]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 173

[6.6003]→[6.6003:6062](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.6003]

[6.6062]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 204

[6.944]→[6.944:1003](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.944]

[6.1003]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 242

[6.2880]→[6.2880:2939](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.2880]

[6.2939]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 286

[6.5264]→[6.5264:5323](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.5264]

[6.5323]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 322

[6.7362]→[6.7362:7421](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.7362]

[6.7421]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 366

[6.339]→[6.339:398](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.339]

[6.398]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 409

[6.209]→[6.209:268](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.209]

[6.268]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 466

[5.270]→[5.270:329](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[5.270]

[5.329]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 492

[6.255]→[6.255:314](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.255]

[6.314]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 521

[6.1565]→[6.1565:1624](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.1565]

[6.1624]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 545

[6.2941]→[6.2941:3000](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.2941]

[6.3000]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 576

[6.4454]→[6.4454:4513](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.4454]

[6.4513]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 604

[6.308]→[6.308:367](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.308]

[6.367]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 650

[6.234]→[6.234:293](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[6.234]

[6.293]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing_tests.lua at line 700

[3.306]→[3.306:365](∅→∅)

Line_width = 256 -- drawing coordinates 1:1 with pixels

[3.306]

[3.365]

Line_width = Margin_left+256 -- drawing coordinates 1:1 with pixels
replacement in drawing.lua at line 11

[6.1580]→[6.2668:2764](∅→∅)

if pmx < Margin_left+Line_width and pmy > line.y and pmy < line.y+Drawing.pixels(line.h) then

[6.1580]

[6.316]

if pmx < Line_width and pmy > line.y and pmy < line.y+Drawing.pixels(line.h) then
replacement in drawing.lua at line 13

[6.359]→[6.2765:2856](∅→∅)

love.graphics.rectangle('line', Margin_left,line.y, Line_width,Drawing.pixels(line.h))

[6.359]

[6.18445]

love.graphics.rectangle('line', Margin_left,line.y, Line_width-Margin_left,Drawing.pixels(line.h))
replacement in drawing.lua at line 15

[6.18484]→[4.15:85](∅→∅)

icon[Current_drawing_mode](Margin_left+Line_width-22, line.y+4)

[6.18484]

[6.523]

icon[Current_drawing_mode](Line_width-22, line.y+4)
replacement in drawing.lua at line 17

[6.532]→[4.86:157](∅→∅)

icon[Previous_drawing_mode](Margin_left+Line_width-22, line.y+4)

[6.532]

[6.589]

icon[Previous_drawing_mode](Line_width-22, line.y+4)
replacement in drawing.lua at line 207

[6.2271]→[6.1603:1725](∅→∅)

return y >= drawing.y and y < drawing.y + Drawing.pixels(drawing.h) and x >= Margin_left and x < Margin_left+Line_width

[6.2271]

[6.795]

return y >= drawing.y and y < drawing.y + Drawing.pixels(drawing.h) and x >= Margin_left and x < Line_width
replacement in drawing.lua at line 688

[6.27500]→[6.921:959](∅→∅)

return math.floor(n*Line_width/256)

[6.27500]

[6.27529]

return math.floor(n*(Line_width-Margin_left)/256)
replacement in drawing.lua at line 691

[6.27579]→[6.960:998](∅→∅)

return math.floor(n*256/Line_width)

[6.27579]

[6.11944]

return math.floor(n*256/(Line_width-Margin_left))