akkartik
/
crosstable.love
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge text0

This commit is contained in:
Kartik K. Agaram 2023-10-09 21:15:21 -07:00
parent 6aae154734 3c92631bdf
commit 8d50a56eb7
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main.lua
View File

@ -18,9 +18,10 @@ function App.version_check()
Error_message = nil
Error_count = 0
-- we'll reuse error mode on load for an initial version check
Supported_versions = {'11.4', '11.3', '11.2', '11.1', '11.0'} -- keep these sorted in descending order
local major, minor = love.getVersion()
Version = major..'.'..minor
Supported_versions = {'11.4', '11.3', '11.2', '11.1', '11.0', '12.0'} -- keep these sorted in descending order
local minor_version
Major_version, minor_version = love.getVersion()
Version = Major_version..'.'..minor_version
if array.find(Supported_versions, Version) == nil then
Mode = 'error'
Error_message = ("This app doesn't support version %s; please use version %s. Press any key to try it with this version anyway."):format(Version, Supported_versions[1])

13
text_tests.lua
View File

@ -1061,7 +1061,14 @@ function test_pagedown_can_start_from_middle_of_long_wrapping_line()
y = y + Editor_state.line_height
App.screen.check(y, 'jkl ', 'screen:2')
y = y + Editor_state.line_height
App.screen.check(y, 'mn', 'screen:3')
if Version == '12.0' then
-- HACK: Maybe v12.0 uses a different font? Strange that it only causes
-- issues in a couple of places.
-- We'll need to rethink our tests if issues like this start to multiply.
App.screen.check(y, 'mno ', 'screen:3')
else
App.screen.check(y, 'mn', 'screen:3')
end
end
function test_pagedown_never_moves_up()
@ -1699,10 +1706,10 @@ function test_position_cursor_on_recently_edited_wrapping_line()
y = y + Editor_state.line_height
App.screen.check(y, 'stu', 'baseline2/screen:3')
-- try to move the cursor earlier in the third screen line by clicking the mouse
edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+Editor_state.line_height*2+5, 1)
edit.run_after_mouse_release(Editor_state, Editor_state.left+2,Editor_state.top+Editor_state.line_height*2+5, 1)
-- cursor should move
check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
check_eq(Editor_state.cursor1.pos, 26, 'cursor:pos')
check_eq(Editor_state.cursor1.pos, 25, 'cursor:pos')
end
function test_backspace_can_scroll_up()