diff options
| -rw-r--r-- | main.lua | 2 | ||||
| -rw-r--r-- | main_tests.lua | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/main.lua b/main.lua index 7f39cb5..0164a7a 100644 --- a/main.lua +++ b/main.lua @@ -122,6 +122,8 @@ function App.resize(w, h) App.screen.width, App.screen.height = w, h Text.redraw_all(Editor_state) Editor_state.selection1 = {} -- no support for shift drag while we're resizing + Editor_state.right = App.screen.width-Margin_right + Editor_state.width = Editor_state.right-Editor_state.left Text.tweak_screen_top_and_cursor(Editor_state, Editor_state.left, Editor_state.right) Last_resize_time = App.getTime() end diff --git a/main_tests.lua b/main_tests.lua index 0f5f675..29f2047 100644 --- a/main_tests.lua +++ b/main_tests.lua @@ -1,12 +1,17 @@ function test_resize_window() io.write('\ntest_resize_window') + App.screen.init{width=300, height=300} + Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width) -- zero right margin Editor_state.filename = 'foo' - App.screen.init{width=Editor_state.left+300, height=300} - check_eq(App.screen.width, Editor_state.left+300, 'F - test_resize_window/baseline/width') + check_eq(App.screen.width, 300, 'F - test_resize_window/baseline/width') check_eq(App.screen.height, 300, 'F - test_resize_window/baseline/height') + check_eq(Editor_state.left, Margin_left, 'F - test_resize_window/baseline/left_margin') App.resize(200, 400) check_eq(App.screen.width, 200, 'F - test_resize_window/width') check_eq(App.screen.height, 400, 'F - test_resize_window/height') + check_eq(Editor_state.left, Margin_left, 'F - test_resize_window/left_margin') + check_eq(Editor_state.right, 200-Margin_right, 'F - test_resize_window/right_margin') + check_eq(Editor_state.width, 200-Margin_right-Margin_left, 'F - test_resize_window/drawing_width') -- TODO: how to make assertions about when App.update got past the early exit? end |