Merge lines.love

This commit is contained in:
Kartik K. Agaram 2022-08-19 16:30:38 -07:00
commit 8d4346f3a8
2 changed files with 6 additions and 4 deletions

View File

@ -341,6 +341,8 @@ function App.disable_tests()
end
-- test methods are disallowed outside tests
App.run_tests = nil
App.disable_tests = nil
App.screen.init = nil
App.filesystem = nil
App.time = nil

View File

@ -390,11 +390,11 @@ function Text.pagedown(State)
-- If a line/paragraph gets to a page boundary, I often want to scroll
-- before I get to the bottom.
-- However, only do this if it makes forward progress.
local top2 = Text.to2(State, State.screen_bottom1)
if top2.screen_line > 1 then
top2.screen_line = math.max(top2.screen_line-10, 1)
local bot2 = Text.to2(State, State.screen_bottom1)
if bot2.screen_line > 1 then
bot2.screen_line = math.max(bot2.screen_line-10, 1)
end
local new_top1 = Text.to1(State, top2)
local new_top1 = Text.to1(State, bot2)
if Text.lt1(State.screen_top1, new_top1) then
State.screen_top1 = new_top1
else