Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-11-10 01:10:34 +00:00
Code Issues Projects Releases Wiki Activity

TextBoxWidget: fix handling of Home/End keys on a scrollable edit box

Browse Source
This commit is contained in:
poire-z 2024-08-25 20:40:10 +02:00
parent 9f308399f9
commit 837b32906a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/ui/widget/textboxwidget.lua
View File

@ -1443,7 +1443,7 @@ function TextBoxWidget:_getXYForCharPos(charpos)
charpos = self.charpos charpos = self.charpos
end end
if self.text == nil or string.len(self.text) == 0 then if self.text == nil or string.len(self.text) == 0 then
return 0, 0 return 0, 0, 1
end end
-- Find the line number: scan up/down from current virtual_line_num -- Find the line number: scan up/down from current virtual_line_num
local ln = self.height == nil and 1 or self.virtual_line_num local ln = self.height == nil and 1 or self.virtual_line_num
@ -1644,7 +1644,7 @@ function TextBoxWidget:moveCursorToCharPos(charpos)
self.charpos = charpos self.charpos = charpos
self.prev_virtual_line_num = self.virtual_line_num self.prev_virtual_line_num = self.virtual_line_num
local x, y, screen_line_num = self:_getXYForCharPos() -- we can get y outside current view local x, y, screen_line_num = self:_getXYForCharPos() -- we can get y outside current view
self.current_line_num = screen_line_num self.current_line_num = screen_line_num + self.virtual_line_num - 1
-- adjust self.virtual_line_num for overflowed y to have y in current view -- adjust self.virtual_line_num for overflowed y to have y in current view
if y < 0 then if y < 0 then
local scroll_lines = math.ceil( -y / self.line_height_px ) local scroll_lines = math.ceil( -y / self.line_height_px )
@ -1886,7 +1886,7 @@ function TextBoxWidget:moveCursorDown()
end end
function TextBoxWidget:moveCursorHome() function TextBoxWidget:moveCursorHome()
self:moveCursorToCharPos(self.vertical_string_list[self.current_line_num] and self.vertical_string_list[self.current_line_num].offset or #self.charlist) self:moveCursorToCharPos(self.vertical_string_list[self.current_line_num] and self.vertical_string_list[self.current_line_num].offset or 1)
end end
function TextBoxWidget:moveCursorEnd() function TextBoxWidget:moveCursorEnd()