renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TextViewer: add navigation buttons (#9539)

Browse Source
This commit is contained in:
hius07
2022-09-22 09:46:15 +03:00
committed by GitHub
parent b0d8919399
commit 46cdf8ed78
2 changed files with 60 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/ui/widget/buttontable.lua
View File

@@ -57,6 +57,7 @@ function ButtonTable:init()
enabled = btn_entry.enabled,
callback = btn_entry.callback,
hold_callback = btn_entry.hold_callback,
allow_hold_when_disabled = btn_entry.allow_hold_when_disabled,
vsync = btn_entry.vsync,
width = math.ceil((self.width - sizer_space)/column_cnt),
max_width = math.ceil((self.width - sizer_space)/column_cnt - 2*self.sep_width - 2*self.padding),

69
frontend/ui/widget/textviewer.lua
View File

@@ -124,15 +124,40 @@ function TextViewer:init()
show_parent = self,
}
-- Callback to enable/disable buttons, for at-top/at-bottom feedback
local prev_at_top = false -- Buttons were created enabled
local prev_at_bottom = false
local function button_update(id, enable)
local button = self.button_table:getButtonById(id)
if button then
if enable then
button:enable()
else
button:disable()
end
button:refresh()
end
end
self._buttons_scroll_callback = function(low, high)
if prev_at_top and low > 0 then
button_update("top", true)
prev_at_top = false
elseif not prev_at_top and low <= 0 then
button_update("top", false)
prev_at_top = true
end
if prev_at_bottom and high < 1 then
button_update("bottom", true)
prev_at_bottom = false
elseif not prev_at_bottom and high >= 1 then
button_update("bottom", false)
prev_at_bottom = true
end
end
-- buttons
local default_buttons =
{
{
text = _("Close"),
callback = function()
self:onClose()
end,
hold_callback = self.default_hold_callback,
},
{
text = _("Find"),
id = "find",
@@ -153,6 +178,31 @@ function TextViewer:init()
end
end,
},
{
text = "⇱",
id = "top",
callback = function()
self.scroll_text_w:scrollToTop()
end,
hold_callback = self.default_hold_callback,
allow_hold_when_disabled = true,
},
{
text = "⇲",
id = "bottom",
callback = function()
self.scroll_text_w:scrollToBottom()
end,
hold_callback = self.default_hold_callback,
allow_hold_when_disabled = true,
},
{
text = _("Close"),
callback = function()
self:onClose()
end,
hold_callback = self.default_hold_callback,
},
}
local buttons = self.buttons_table or {}
if self.add_default_buttons or not self.buttons_table then
@@ -180,6 +230,7 @@ function TextViewer:init()
para_direction_rtl = self.para_direction_rtl,
auto_para_direction = self.auto_para_direction,
alignment_strict = self.alignment_strict,
scroll_callback = self._buttons_scroll_callback,
}
self.textw = FrameContainer:new{
padding = self.text_padding,
@@ -359,9 +410,7 @@ function TextViewer:findCallback(input_dialog)
local button_text = self._find_next and _("Find next") or _("Find")
local find_button = self.button_table:getButtonById("find")
find_button:setText(button_text, find_button.width)
UIManager:setDirty(self, function()
return "ui", find_button.dimen
end)
find_button:refresh()
end
end