diff options
-rw-r--r-- | drawing_tests.lua | 158 | ||||
-rw-r--r-- | edit.lua | 13 | ||||
-rw-r--r-- | text.lua | 6 | ||||
-rw-r--r-- | text_tests.lua | 2 |
4 files changed, 89 insertions, 90 deletions
diff --git a/drawing_tests.lua b/drawing_tests.lua index b13968a..4ea4b04 100644 --- a/drawing_tests.lua +++ b/drawing_tests.lua @@ -32,12 +32,12 @@ function test_draw_line() edit.draw(Editor_state) check_eq(#Editor_state.lines, 2, 'F - test_draw_line/baseline/#lines') check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_line/baseline/mode') - check_eq(Editor_state.lines[1].y, Editor_state.top+Editor_state.drawing_padding_top, 'F - test_draw_line/baseline/y') + check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_line/baseline/y') check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_line/baseline/y') check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_line/baseline/#shapes') -- draw a line - edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1) - edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_draw_line/#shapes') check_eq(#drawing.points, 2, 'F - test_draw_line/#points') @@ -76,12 +76,12 @@ function test_draw_horizontal_line() edit.draw(Editor_state) check_eq(#Editor_state.lines, 2, 'F - test_draw_horizontal_line/baseline/#lines') check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_horizontal_line/baseline/mode') - check_eq(Editor_state.lines[1].y, Editor_state.top+Editor_state.drawing_padding_top, 'F - test_draw_horizontal_line/baseline/y') + check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_horizontal_line/baseline/y') check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_horizontal_line/baseline/y') check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_horizontal_line/baseline/#shapes') -- draw a line that is more horizontal than vertical - edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1) - edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+26, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+26, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_draw_horizontal_line/#shapes') check_eq(#drawing.points, 2, 'F - test_draw_horizontal_line/#points') @@ -104,14 +104,14 @@ function test_draw_circle() edit.draw(Editor_state) check_eq(#Editor_state.lines, 2, 'F - test_draw_circle/baseline/#lines') check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_circle/baseline/mode') - check_eq(Editor_state.lines[1].y, Editor_state.top+Editor_state.drawing_padding_top, 'F - test_draw_circle/baseline/y') + check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_circle/baseline/y') check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_circle/baseline/y') check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_circle/baseline/#shapes') -- draw a circle - App.mouse_move(Editor_state.left+4, Editor_state.top+Editor_state.drawing_padding_top+4) -- hover on drawing + App.mouse_move(Editor_state.left+4, Editor_state.top+Drawing_padding_top+4) -- hover on drawing edit.run_after_keychord(Editor_state, 'C-o') - edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) - edit.run_after_mouse_release(Editor_state, Editor_state.left+35+30, Editor_state.top+Editor_state.drawing_padding_top+36, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+35+30, Editor_state.top+Drawing_padding_top+36, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_draw_circle/#shapes') check_eq(#drawing.points, 1, 'F - test_draw_circle/#points') @@ -133,14 +133,14 @@ function test_cancel_stroke() edit.draw(Editor_state) check_eq(#Editor_state.lines, 2, 'F - test_cancel_stroke/baseline/#lines') check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_cancel_stroke/baseline/mode') - check_eq(Editor_state.lines[1].y, Editor_state.top+Editor_state.drawing_padding_top, 'F - test_cancel_stroke/baseline/y') + check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_cancel_stroke/baseline/y') check_eq(Editor_state.lines[1].h, 128, 'F - test_cancel_stroke/baseline/y') check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_cancel_stroke/baseline/#shapes') -- start drawing a line - edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1) -- cancel edit.run_after_keychord(Editor_state, 'escape') - edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 0, 'F - test_cancel_stroke/#shapes') end @@ -154,7 +154,7 @@ function test_keys_do_not_affect_shape_when_mouse_up() Editor_state.current_drawing_mode = 'line' edit.draw(Editor_state) -- hover over drawing and press 'o' without holding mouse - App.mouse_move(Editor_state.left+4, Editor_state.top+Editor_state.drawing_padding_top+4) -- hover on drawing + App.mouse_move(Editor_state.left+4, Editor_state.top+Drawing_padding_top+4) -- hover on drawing edit.run_after_keychord(Editor_state, 'o') -- no change to drawing mode check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_keys_do_not_affect_shape_when_mouse_up/drawing_mode') @@ -171,14 +171,14 @@ function test_draw_circle_mid_stroke() edit.draw(Editor_state) check_eq(#Editor_state.lines, 2, 'F - test_draw_circle_mid_stroke/baseline/#lines') check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_circle_mid_stroke/baseline/mode') - check_eq(Editor_state.lines[1].y, Editor_state.top+Editor_state.drawing_padding_top, 'F - test_draw_circle_mid_stroke/baseline/y') + check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_circle_mid_stroke/baseline/y') check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_circle_mid_stroke/baseline/y') check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_circle_mid_stroke/baseline/#shapes') -- draw a circle - App.mouse_move(Editor_state.left+4, Editor_state.top+Editor_state.drawing_padding_top+4) -- hover on drawing - edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) + App.mouse_move(Editor_state.left+4, Editor_state.top+Drawing_padding_top+4) -- hover on drawing + edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) edit.run_after_keychord(Editor_state, 'o') - edit.run_after_mouse_release(Editor_state, Editor_state.left+35+30, Editor_state.top+Editor_state.drawing_padding_top+36, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+35+30, Editor_state.top+Drawing_padding_top+36, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_draw_circle_mid_stroke/#shapes') check_eq(#drawing.points, 1, 'F - test_draw_circle_mid_stroke/#points') @@ -199,14 +199,14 @@ function test_draw_arc() edit.draw(Editor_state) check_eq(#Editor_state.lines, 2, 'F - test_draw_arc/baseline/#lines') check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_arc/baseline/mode') - check_eq(Editor_state.lines[1].y, Editor_state.top+Editor_state.drawing_padding_top, 'F - test_draw_arc/baseline/y') + check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_arc/baseline/y') check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_arc/baseline/y') check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_arc/baseline/#shapes') -- draw an arc - edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) - App.mouse_move(Editor_state.left+35+30, Editor_state.top+Editor_state.drawing_padding_top+36) + edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) + App.mouse_move(Editor_state.left+35+30, Editor_state.top+Drawing_padding_top+36) edit.run_after_keychord(Editor_state, 'a') -- arc mode - edit.run_after_mouse_release(Editor_state, Editor_state.left+35+50, Editor_state.top+Editor_state.drawing_padding_top+36+50, 1) -- 45° + edit.run_after_mouse_release(Editor_state, Editor_state.left+35+50, Editor_state.top+Drawing_padding_top+36+50, 1) -- 45° local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_draw_arc/#shapes') check_eq(#drawing.points, 1, 'F - test_draw_arc/#points') @@ -230,17 +230,17 @@ function test_draw_polygon() check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_draw_polygon/baseline/drawing_mode') check_eq(#Editor_state.lines, 2, 'F - test_draw_polygon/baseline/#lines') check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_polygon/baseline/mode') - check_eq(Editor_state.lines[1].y, Editor_state.top+Editor_state.drawing_padding_top, 'F - test_draw_polygon/baseline/y') + check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_polygon/baseline/y') check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_polygon/baseline/y') check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_polygon/baseline/#shapes') -- first point - edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1) edit.run_after_keychord(Editor_state, 'g') -- polygon mode -- second point - App.mouse_move(Editor_state.left+65, Editor_state.top+Editor_state.drawing_padding_top+36) + App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+36) edit.run_after_keychord(Editor_state, 'p') -- add point -- final point - edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+26, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+26, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_draw_polygon/#shapes') check_eq(#drawing.points, 3, 'F - test_draw_polygon/vertices') @@ -268,20 +268,20 @@ function test_draw_rectangle() check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_draw_rectangle/baseline/drawing_mode') check_eq(#Editor_state.lines, 2, 'F - test_draw_rectangle/baseline/#lines') check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_rectangle/baseline/mode') - check_eq(Editor_state.lines[1].y, Editor_state.top+Editor_state.drawing_padding_top, 'F - test_draw_rectangle/baseline/y') + check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_rectangle/baseline/y') check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_rectangle/baseline/y') check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_rectangle/baseline/#shapes') -- first point - edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) edit.run_after_keychord(Editor_state, 'r') -- rectangle mode -- second point/first edge - App.mouse_move(Editor_state.left+42, Editor_state.top+Editor_state.drawing_padding_top+45) + App.mouse_move(Editor_state.left+42, Editor_state.top+Drawing_padding_top+45) edit.run_after_keychord(Editor_state, 'p') -- override second point/first edge - App.mouse_move(Editor_state.left+75, Editor_state.top+Editor_state.drawing_padding_top+76) + App.mouse_move(Editor_state.left+75, Editor_state.top+Drawing_padding_top+76) edit.run_after_keychord(Editor_state, 'p') -- release (decides 'thickness' of rectangle perpendicular to first edge) - edit.run_after_mouse_release(Editor_state, Editor_state.left+15, Editor_state.top+Editor_state.drawing_padding_top+26, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+15, Editor_state.top+Drawing_padding_top+26, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_draw_rectangle/#shapes') check_eq(#drawing.points, 5, 'F - test_draw_rectangle/#points') -- currently includes every point added @@ -312,17 +312,17 @@ function test_draw_rectangle_intermediate() check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_draw_rectangle_intermediate/baseline/drawing_mode') check_eq(#Editor_state.lines, 2, 'F - test_draw_rectangle_intermediate/baseline/#lines') check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_rectangle_intermediate/baseline/mode') - check_eq(Editor_state.lines[1].y, Editor_state.top+Editor_state.drawing_padding_top, 'F - test_draw_rectangle_intermediate/baseline/y') + check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_rectangle_intermediate/baseline/y') check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_rectangle_intermediate/baseline/y') check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_rectangle_intermediate/baseline/#shapes') -- first point - edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) edit.run_after_keychord(Editor_state, 'r') -- rectangle mode -- second point/first edge - App.mouse_move(Editor_state.left+42, Editor_state.top+Editor_state.drawing_padding_top+45) + App.mouse_move(Editor_state.left+42, Editor_state.top+Drawing_padding_top+45) edit.run_after_keychord(Editor_state, 'p') -- override second point/first edge - App.mouse_move(Editor_state.left+75, Editor_state.top+Editor_state.drawing_padding_top+76) + App.mouse_move(Editor_state.left+75, Editor_state.top+Drawing_padding_top+76) edit.run_after_keychord(Editor_state, 'p') local drawing = Editor_state.lines[1] check_eq(#drawing.points, 3, 'F - test_draw_rectangle_intermediate/#points') -- currently includes every point added @@ -348,20 +348,20 @@ function test_draw_square() check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_draw_square/baseline/drawing_mode') check_eq(#Editor_state.lines, 2, 'F - test_draw_square/baseline/#lines') check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_square/baseline/mode') - check_eq(Editor_state.lines[1].y, Editor_state.top+Editor_state.drawing_padding_top, 'F - test_draw_square/baseline/y') + check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_square/baseline/y') check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_square/baseline/y') check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_square/baseline/#shapes') -- first point - edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) edit.run_after_keychord(Editor_state, 's') -- square mode -- second point/first edge - App.mouse_move(Editor_state.left+42, Editor_state.top+Editor_state.drawing_padding_top+45) + App.mouse_move(Editor_state.left+42, Editor_state.top+Drawing_padding_top+45) edit.run_after_keychord(Editor_state, 'p') -- override second point/first edge - App.mouse_move(Editor_state.left+65, Editor_state.top+Editor_state.drawing_padding_top+66) + App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+66) edit.run_after_keychord(Editor_state, 'p') -- release (decides which side of first edge to draw square on) - edit.run_after_mouse_release(Editor_state, Editor_state.left+15, Editor_state.top+Editor_state.drawing_padding_top+26, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+15, Editor_state.top+Drawing_padding_top+26, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_draw_square/#shapes') check_eq(#drawing.points, 5, 'F - test_draw_square/#points') -- currently includes every point added @@ -391,8 +391,8 @@ function test_name_point() Editor_state.current_drawing_mode = 'line' edit.draw(Editor_state) -- draw a line - edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1) - edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_name_point/baseline/#shapes') check_eq(#drawing.points, 2, 'F - test_name_point/baseline/#points') @@ -433,8 +433,8 @@ function test_move_point() Editor_state.lines = load_array{'```lines', '```', ''} Editor_state.current_drawing_mode = 'line' edit.draw(Editor_state) - edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1) - edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_move_point/baseline/#shapes') check_eq(#drawing.points, 2, 'F - test_move_point/baseline/#points') @@ -462,13 +462,13 @@ function test_move_point() check_eq(drawing.pending.mode, 'move', 'F - test_move_point/mode:2') check_eq(drawing.pending.target_point, p2, 'F - test_move_point/target') -- move point - App.mouse_move(Editor_state.left+26, Editor_state.top+Editor_state.drawing_padding_top+44) + App.mouse_move(Editor_state.left+26, Editor_state.top+Drawing_padding_top+44) edit.update(Editor_state, 0.05) local p2 = drawing.points[drawing.shapes[1].p2] check_eq(p2.x, 26, 'F - test_move_point/x') check_eq(p2.y, 44, 'F - test_move_point/y') -- exit 'move' mode - edit.run_after_mouse_click(Editor_state, Editor_state.left+26, Editor_state.top+Editor_state.drawing_padding_top+44, 1) + edit.run_after_mouse_click(Editor_state, Editor_state.left+26, Editor_state.top+Drawing_padding_top+44, 1) check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_move_point/mode:3') check_eq(drawing.pending, {}, 'F - test_move_point/pending') -- wait until save @@ -490,8 +490,8 @@ function test_move_point_on_manhattan_line() Editor_state.lines = load_array{'```lines', '```', ''} Editor_state.current_drawing_mode = 'manhattan' edit.draw(Editor_state) - edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1) - edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+46, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+46, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_move_point_on_manhattan_line/baseline/#shapes') check_eq(#drawing.points, 2, 'F - test_move_point_on_manhattan_line/baseline/#points') @@ -501,7 +501,7 @@ function test_move_point_on_manhattan_line() edit.run_after_keychord(Editor_state, 'C-u') check_eq(Editor_state.current_drawing_mode, 'move', 'F - test_move_point_on_manhattan_line/mode:1') -- move point - App.mouse_move(Editor_state.left+26, Editor_state.top+Editor_state.drawing_padding_top+44) + App.mouse_move(Editor_state.left+26, Editor_state.top+Drawing_padding_top+44) edit.update(Editor_state, 0.05) -- line is no longer manhattan check_eq(drawing.shapes[1].mode, 'line', 'F - test_move_point_on_manhattan_line/baseline/shape:1') @@ -516,16 +516,16 @@ function test_delete_lines_at_point() Editor_state.lines = load_array{'```lines', '```', ''} Editor_state.current_drawing_mode = 'line' edit.draw(Editor_state) - edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1) - edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) - edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) - edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Editor_state.drawing_padding_top+26, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Drawing_padding_top+26, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 2, 'F - test_delete_lines_at_point/baseline/#shapes') check_eq(drawing.shapes[1].mode, 'line', 'F - test_delete_lines_at_point/baseline/shape:1') check_eq(drawing.shapes[2].mode, 'line', 'F - test_delete_lines_at_point/baseline/shape:2') -- hover on the common point and delete - App.mouse_move(Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36) + App.mouse_move(Editor_state.left+35, Editor_state.top+Drawing_padding_top+36) edit.run_after_keychord(Editor_state, 'C-d') check_eq(drawing.shapes[1].mode, 'deleted', 'F - test_delete_lines_at_point/shape:1') check_eq(drawing.shapes[2].mode, 'deleted', 'F - test_delete_lines_at_point/shape:2') @@ -545,16 +545,16 @@ function test_delete_line_under_mouse_pointer() Editor_state.lines = load_array{'```lines', '```', ''} Editor_state.current_drawing_mode = 'line' edit.draw(Editor_state) - edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1) - edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) - edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) - edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Editor_state.drawing_padding_top+26, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Drawing_padding_top+26, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 2, 'F - test_delete_line_under_mouse_pointer/baseline/#shapes') check_eq(drawing.shapes[1].mode, 'line', 'F - test_delete_line_under_mouse_pointer/baseline/shape:1') check_eq(drawing.shapes[2].mode, 'line', 'F - test_delete_line_under_mouse_pointer/baseline/shape:2') -- hover on one of the lines and delete - App.mouse_move(Editor_state.left+25, Editor_state.top+Editor_state.drawing_padding_top+26) + App.mouse_move(Editor_state.left+25, Editor_state.top+Drawing_padding_top+26) edit.run_after_keychord(Editor_state, 'C-d') -- only that line is deleted check_eq(drawing.shapes[1].mode, 'deleted', 'F - test_delete_line_under_mouse_pointer/shape:1') @@ -570,22 +570,22 @@ function test_delete_point_from_polygon() Editor_state.current_drawing_mode = 'line' edit.draw(Editor_state) -- first point - edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1) edit.run_after_keychord(Editor_state, 'g') -- polygon mode -- second point - App.mouse_move(Editor_state.left+65, Editor_state.top+Editor_state.drawing_padding_top+36) + App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+36) edit.run_after_keychord(Editor_state, 'p') -- add point -- third point - App.mouse_move(Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+26) + App.mouse_move(Editor_state.left+35, Editor_state.top+Drawing_padding_top+26) edit.run_after_keychord(Editor_state, 'p') -- add point -- fourth point - edit.run_after_mouse_release(Editor_state, Editor_state.left+14, Editor_state.top+Editor_state.drawing_padding_top+16, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+14, Editor_state.top+Drawing_padding_top+16, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_delete_point_from_polygon/baseline/#shapes') check_eq(drawing.shapes[1].mode, 'polygon', 'F - test_delete_point_from_polygon/baseline/mode') check_eq(#drawing.shapes[1].vertices, 4, 'F - test_delete_point_from_polygon/baseline/vertices') -- hover on a point and delete - App.mouse_move(Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+26) + App.mouse_move(Editor_state.left+35, Editor_state.top+Drawing_padding_top+26) edit.run_after_keychord(Editor_state, 'C-d') -- just the one point is deleted check_eq(drawing.shapes[1].mode, 'polygon', 'F - test_delete_point_from_polygon/shape') @@ -601,19 +601,19 @@ function test_delete_point_from_polygon() Editor_state.current_drawing_mode = 'line' edit.draw(Editor_state) -- first point - edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1) edit.run_after_keychord(Editor_state, 'g') -- polygon mode -- second point - App.mouse_move(Editor_state.left+65, Editor_state.top+Editor_state.drawing_padding_top+36) + App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+36) edit.run_after_keychord(Editor_state, 'p') -- add point -- third point - edit.run_after_mouse_release(Editor_state, Editor_state.left+14, Editor_state.top+Editor_state.drawing_padding_top+16, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+14, Editor_state.top+Drawing_padding_top+16, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_delete_point_from_polygon/baseline/#shapes') check_eq(drawing.shapes[1].mode, 'polygon', 'F - test_delete_point_from_polygon/baseline/mode') check_eq(#drawing.shapes[1].vertices, 3, 'F - test_delete_point_from_polygon/baseline/vertices') -- hover on a point and delete - App.mouse_move(Editor_state.left+65, Editor_state.top+Editor_state.drawing_padding_top+36) + App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+36) edit.run_after_keychord(Editor_state, 'C-d') -- there's < 3 points left, so the whole polygon is deleted check_eq(drawing.shapes[1].mode, 'deleted', 'F - test_delete_point_from_polygon') @@ -629,8 +629,8 @@ function test_undo_name_point() Editor_state.current_drawing_mode = 'line' edit.draw(Editor_state) -- draw a line - edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1) - edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_undo_name_point/baseline/#shapes') check_eq(#drawing.points, 2, 'F - test_undo_name_point/baseline/#points') @@ -676,8 +676,8 @@ function test_undo_move_point() Editor_state.lines = load_array{'```lines', '```', ''} Editor_state.current_drawing_mode = 'line' edit.draw(Editor_state) - edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1) - edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 1, 'F - test_undo_move_point/baseline/#shapes') check_eq(#drawing.points, 2, 'F - test_undo_move_point/baseline/#points') @@ -691,13 +691,13 @@ function test_undo_move_point() check_nil(p2.name, 'F - test_undo_move_point/baseline/p2:name') -- move p2 edit.run_after_keychord(Editor_state, 'C-u') - App.mouse_move(Editor_state.left+26, Editor_state.top+Editor_state.drawing_padding_top+44) + App.mouse_move(Editor_state.left+26, Editor_state.top+Drawing_padding_top+44) edit.update(Editor_state, 0.05) local p2 = drawing.points[drawing.shapes[1].p2] check_eq(p2.x, 26, 'F - test_undo_move_point/x') check_eq(p2.y, 44, 'F - test_undo_move_point/y') -- exit 'move' mode - edit.run_after_mouse_click(Editor_state, Editor_state.left+26, Editor_state.top+Editor_state.drawing_padding_top+44, 1) + edit.run_after_mouse_click(Editor_state, Editor_state.left+26, Editor_state.top+Drawing_padding_top+44, 1) check_eq(Editor_state.next_history, 4, 'F - test_undo_move_point/next_history') -- undo edit.run_after_keychord(Editor_state, 'C-z') @@ -726,16 +726,16 @@ function test_undo_delete_point() Editor_state.lines = load_array{'```lines', '```', ''} Editor_state.current_drawing_mode = 'line' edit.draw(Editor_state) - edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1) - edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) - edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1) - edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Editor_state.drawing_padding_top+26, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) + edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1) + edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Drawing_padding_top+26, 1) local drawing = Editor_state.lines[1] check_eq(#drawing.shapes, 2, 'F - test_undo_delete_point/baseline/#shapes') check_eq(drawing.shapes[1].mode, 'line', 'F - test_undo_delete_point/baseline/shape:1') check_eq(drawing.shapes[2].mode, 'line', 'F - test_undo_delete_point/baseline/shape:2') -- hover on the common point and delete - App.mouse_move(Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36) + App.mouse_move(Editor_state.left+35, Editor_state.top+Drawing_padding_top+36) edit.run_after_keychord(Editor_state, 'C-d') check_eq(drawing.shapes[1].mode, 'deleted', 'F - test_undo_delete_point/shape:1') check_eq(drawing.shapes[2].mode, 'deleted', 'F - test_undo_delete_point/shape:2') diff --git a/edit.lua b/edit.lua index c56bccc..21e7d86 100644 --- a/edit.lua +++ b/edit.lua @@ -14,6 +14,10 @@ Margin_top = 15 Margin_left = 25 Margin_right = 25 +Drawing_padding_top = 10 +Drawing_padding_bottom = 10 +Drawing_padding_height = Drawing_padding_top + Drawing_padding_bottom + Same_point_distance = 4 -- pixel distance at which two points are considered the same utf8 = require 'utf8' @@ -97,10 +101,6 @@ function edit.initialize_state(top, left, right, font_height, line_height) -- c right = right, width = right-left, - drawing_padding_top = 10, - drawing_padding_bottom = 10, - drawing_padding_height = nil, - filename = love.filesystem.getUserDirectory()..'/lines.txt', next_save = nil, @@ -113,7 +113,6 @@ function edit.initialize_state(top, left, right, font_height, line_height) -- c search_text = nil, search_backup = nil, -- stuff to restore when cancelling search } - result.drawing_padding_height = result.drawing_padding_top + result.drawing_padding_bottom return result end -- App.initialize_state @@ -153,10 +152,10 @@ function edit.draw(State) State.screen_bottom1.pos = State.screen_top1.pos y = y + State.line_height elseif line.mode == 'drawing' then - y = y+State.drawing_padding_top + y = y+Drawing_padding_top line.y = y Drawing.draw(State, line) - y = y + Drawing.pixels(line.h, State.width) + State.drawing_padding_bottom + y = y + Drawing.pixels(line.h, State.width) + Drawing_padding_bottom else line.starty = y line.startpos = 1 diff --git a/text.lua b/text.lua index c07755e..d4bfbc2 100644 --- a/text.lua +++ b/text.lua @@ -363,7 +363,7 @@ function Text.pageup(State) if State.lines[State.screen_top1.line].mode == 'text' then y = y - State.line_height elseif State.lines[State.screen_top1.line].mode == 'drawing' then - y = y - State.drawing_padding_height - Drawing.pixels(State.lines[State.screen_top1.line].h, State.width) + y = y - Drawing_padding_height - Drawing.pixels(State.lines[State.screen_top1.line].h, State.width) end top2 = Text.previous_screen_line(State, top2) end @@ -641,7 +641,7 @@ function Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necess break end --? print('cursor skips', State.cursor1.line) - y = y + State.drawing_padding_height + Drawing.pixels(State.lines[State.cursor1.line].h, State.width) + y = y + Drawing_padding_height + Drawing.pixels(State.lines[State.cursor1.line].h, State.width) State.cursor1.line = State.cursor1.line + 1 end -- hack: insert a text line at bottom of file if necessary @@ -677,7 +677,7 @@ function Text.snap_cursor_to_bottom_of_screen(State) assert(State.lines[top2.line-1].mode == 'drawing') -- We currently can't draw partial drawings, so either skip it entirely -- or not at all. - local h = State.drawing_padding_height + Drawing.pixels(State.lines[top2.line-1].h, State.width) + local h = Drawing_padding_height + Drawing.pixels(State.lines[top2.line-1].h, State.width) if y - h < State.top then break end diff --git a/text_tests.lua b/text_tests.lua index d74eb98..0126fef 100644 --- a/text_tests.lua +++ b/text_tests.lua @@ -866,7 +866,7 @@ function test_pagedown_skips_drawings() Editor_state.cursor1 = {line=1, pos=1} Editor_state.screen_top1 = {line=1, pos=1} Editor_state.screen_bottom1 = {} - local drawing_height = Editor_state.drawing_padding_height + drawing_width/2 -- default + local drawing_height = Drawing_padding_height + drawing_width/2 -- default -- initially the screen displays the first line and the drawing -- 15px margin + 15px line1 + 10px margin + 25px drawing + 10px margin = 75px < screen height 80px edit.draw(Editor_state) |