From f029c710b5f9c8af00d4146af57cbfb8dcda29e8 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Wed, 17 Aug 2022 09:36:17 -0700 Subject: simplify cursor-on-screen check --- edit.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'edit.lua') diff --git a/edit.lua b/edit.lua index ccf675b..a0293ab 100644 --- a/edit.lua +++ b/edit.lua @@ -134,7 +134,8 @@ function edit.draw(State) print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos) assert(false) end - State.cursor_y = -1 + State.cursor_x = nil + State.cursor_y = nil local y = State.top --? print('== draw') for line_index = State.screen_top1.line,#State.lines do @@ -176,9 +177,6 @@ function edit.draw(State) assert(false) end end - if State.cursor_y == -1 then - State.cursor_y = App.screen.height - end --? print('screen bottom: '..tostring(State.screen_bottom1.pos)..' in '..tostring(State.lines[State.screen_bottom1.line].data)) if State.search_term then Text.draw_search_bar(State) @@ -408,7 +406,7 @@ function edit.keychord_pressed(State, chord, key) Text.insert_at_cursor(State, c) end end - if Text.cursor_past_screen_bottom(State) then + if Text.cursor_out_of_screen(State) then Text.snap_cursor_to_bottom_of_screen(State, State.left, State.right) end schedule_save(State) -- cgit 1.4.1-2-gfad0