mirror of
https://github.com/koreader/koreader
synced 2024-11-18 03:25:46 +00:00
fadee1f5dc
Basically: * Use `extend` for class definitions * Use `new` for object instantiations That includes some minor code cleanups along the way: * Updated `Widget`'s docs to make the semantics clearer. * Removed `should_restrict_JIT` (it's been dead code since https://github.com/koreader/android-luajit-launcher/pull/283) * Minor refactoring of LuaSettings/LuaData/LuaDefaults/DocSettings to behave (mostly, they are instantiated via `open` instead of `new`) like everything else and handle inheritance properly (i.e., DocSettings is now a proper LuaSettings subclass). * Default to `WidgetContainer` instead of `InputContainer` for stuff that doesn't actually setup key/gesture events. * Ditto for explicit `*Listener` only classes, make sure they're based on `EventListener` instead of something uselessly fancier. * Unless absolutely necessary, do not store references in class objects, ever; only values. Instead, always store references in instances, to avoid both sneaky inheritance issues, and sneaky GC pinning of stale references. * ReaderUI: Fix one such issue with its `active_widgets` array, with critical implications, as it essentially pinned *all* of ReaderUI's modules, including their reference to the `Document` instance (i.e., that was a big-ass leak). * Terminal: Make sure the shell is killed on plugin teardown. * InputText: Fix Home/End/Del physical keys to behave sensibly. * InputContainer/WidgetContainer: If necessary, compute self.dimen at paintTo time (previously, only InputContainers did, which might have had something to do with random widgets unconcerned about input using it as a baseclass instead of WidgetContainer...). * OverlapGroup: Compute self.dimen at *init* time, because for some reason it needs to do that, but do it directly in OverlapGroup instead of going through a weird WidgetContainer method that it was the sole user of. * ReaderCropping: Under no circumstances should a Document instance member (here, self.bbox) risk being `nil`ed! * Kobo: Minor code cleanups.
212 lines
6.9 KiB
Lua
212 lines
6.9 KiB
Lua
--[[--
|
|
HTML widget with vertical scroll bar.
|
|
--]]
|
|
|
|
local BD = require("ui/bidi")
|
|
local Device = require("device")
|
|
local HtmlBoxWidget = require("ui/widget/htmlboxwidget")
|
|
local Geom = require("ui/geometry")
|
|
local GestureRange = require("ui/gesturerange")
|
|
local HorizontalGroup = require("ui/widget/horizontalgroup")
|
|
local HorizontalSpan = require("ui/widget/horizontalspan")
|
|
local InputContainer = require("ui/widget/container/inputcontainer")
|
|
local UIManager = require("ui/uimanager")
|
|
local VerticalScrollBar = require("ui/widget/verticalscrollbar")
|
|
local Input = Device.input
|
|
local Screen = Device.screen
|
|
|
|
local ScrollHtmlWidget = InputContainer:extend{
|
|
html_body = nil,
|
|
css = nil,
|
|
default_font_size = Screen:scaleBySize(24), -- same as infofont
|
|
htmlbox_widget = nil,
|
|
v_scroll_bar = nil,
|
|
dialog = nil,
|
|
html_link_tapped_callback = nil,
|
|
dimen = nil,
|
|
width = 0,
|
|
height = 0,
|
|
scroll_bar_width = Screen:scaleBySize(6),
|
|
text_scroll_span = Screen:scaleBySize(12),
|
|
}
|
|
|
|
function ScrollHtmlWidget:init()
|
|
self.htmlbox_widget = HtmlBoxWidget:new{
|
|
dimen = Geom:new{
|
|
w = self.width - self.scroll_bar_width - self.text_scroll_span,
|
|
h = self.height,
|
|
},
|
|
html_link_tapped_callback = self.html_link_tapped_callback,
|
|
}
|
|
|
|
self.htmlbox_widget:setContent(self.html_body, self.css, self.default_font_size)
|
|
|
|
self.v_scroll_bar = VerticalScrollBar:new{
|
|
enable = self.htmlbox_widget.page_count > 1,
|
|
width = self.scroll_bar_width,
|
|
height = self.height,
|
|
scroll_callback = function(ratio)
|
|
self:scrollToRatio(ratio)
|
|
end
|
|
}
|
|
|
|
self:_updateScrollBar()
|
|
|
|
local horizontal_group = HorizontalGroup:new{}
|
|
table.insert(horizontal_group, self.htmlbox_widget)
|
|
table.insert(horizontal_group, HorizontalSpan:new{width=self.text_scroll_span})
|
|
table.insert(horizontal_group, self.v_scroll_bar)
|
|
self[1] = horizontal_group
|
|
|
|
self.dimen = Geom:new(self[1]:getSize())
|
|
|
|
if Device:isTouchDevice() then
|
|
self.ges_events = {
|
|
ScrollText = {
|
|
GestureRange:new{
|
|
ges = "swipe",
|
|
range = function() return self.dimen end,
|
|
},
|
|
},
|
|
TapScrollText = { -- allow scrolling with tap
|
|
GestureRange:new{
|
|
ges = "tap",
|
|
range = function() return self.dimen end,
|
|
},
|
|
},
|
|
}
|
|
end
|
|
|
|
if Device:hasKeys() then
|
|
self.key_events = {
|
|
ScrollDown = {{Input.group.PgFwd}, doc = "scroll down"},
|
|
ScrollUp = {{Input.group.PgBack}, doc = "scroll up"},
|
|
}
|
|
end
|
|
end
|
|
|
|
-- Not to be confused with ScrollTextWidget's updateScrollBar, which has user-visible effects.
|
|
-- This simply updates the scroll bar's internal state according to the current page & page count.
|
|
function ScrollHtmlWidget:_updateScrollBar()
|
|
self.v_scroll_bar:set((self.htmlbox_widget.page_number-1) / self.htmlbox_widget.page_count, self.htmlbox_widget.page_number / self.htmlbox_widget.page_count)
|
|
end
|
|
|
|
function ScrollHtmlWidget:getSinglePageHeight()
|
|
return self.htmlbox_widget:getSinglePageHeight()
|
|
end
|
|
|
|
-- Reset the scrolling *state* to the top of the document, but don't actually re-render/refresh anything.
|
|
-- (Useful when replacing a Scroll*Widget during an update call, c.f., DictQuickLookup).
|
|
function ScrollHtmlWidget:resetScroll()
|
|
self.htmlbox_widget.page_number = 1
|
|
self:_updateScrollBar()
|
|
|
|
self.v_scroll_bar.enable = self.htmlbox_widget.page_count > 1
|
|
end
|
|
|
|
function ScrollHtmlWidget:scrollToRatio(ratio)
|
|
ratio = math.max(0, math.min(1, ratio)) -- ensure ratio is between 0 and 1 (100%)
|
|
local page_num = 1 + math.floor((self.htmlbox_widget.page_count) * ratio)
|
|
if page_num > self.htmlbox_widget.page_count then
|
|
page_num = self.htmlbox_widget.page_count
|
|
end
|
|
if page_num == self.htmlbox_widget.page_number then
|
|
return
|
|
end
|
|
self.htmlbox_widget.page_number = page_num
|
|
self:_updateScrollBar()
|
|
|
|
self.htmlbox_widget:freeBb()
|
|
self.htmlbox_widget:_render()
|
|
|
|
-- If our dialog is currently wrapped in a MovableContainer and that container has been made translucent,
|
|
-- reset the alpha and refresh the whole thing, because we assume that a scroll means the user actually wants to
|
|
-- *read* the content, which is kinda hard on a nearly transparent widget ;).
|
|
if self.dialog.movable and self.dialog.movable.alpha then
|
|
self.dialog.movable.alpha = nil
|
|
UIManager:setDirty(self.dialog, function()
|
|
return "partial", self.dialog.movable.dimen
|
|
end)
|
|
else
|
|
UIManager:setDirty(self.dialog, function()
|
|
return "partial", self.dimen
|
|
end)
|
|
end
|
|
end
|
|
|
|
function ScrollHtmlWidget:scrollText(direction)
|
|
if direction == 0 then
|
|
return
|
|
end
|
|
|
|
if direction > 0 then
|
|
if self.htmlbox_widget.page_number >= self.htmlbox_widget.page_count then
|
|
return
|
|
end
|
|
|
|
self.htmlbox_widget.page_number = self.htmlbox_widget.page_number + 1
|
|
elseif direction < 0 then
|
|
if self.htmlbox_widget.page_number <= 1 then
|
|
return
|
|
end
|
|
|
|
self.htmlbox_widget.page_number = self.htmlbox_widget.page_number - 1
|
|
end
|
|
self:_updateScrollBar()
|
|
|
|
self.htmlbox_widget:freeBb()
|
|
self.htmlbox_widget:_render()
|
|
|
|
-- Handle the container's alpha as above...
|
|
if self.dialog.movable and self.dialog.movable.alpha then
|
|
self.dialog.movable.alpha = nil
|
|
UIManager:setDirty(self.dialog, function()
|
|
return "partial", self.dialog.movable.dimen
|
|
end)
|
|
else
|
|
UIManager:setDirty(self.dialog, function()
|
|
return "partial", self.dimen
|
|
end)
|
|
end
|
|
end
|
|
|
|
function ScrollHtmlWidget:onScrollText(arg, ges)
|
|
if ges.direction == "north" then
|
|
self:scrollText(1)
|
|
return true
|
|
elseif ges.direction == "south" then
|
|
self:scrollText(-1)
|
|
return true
|
|
end
|
|
-- if swipe west/east, let it propagate up (e.g. for quickdictlookup to
|
|
-- go to next/prev result)
|
|
end
|
|
|
|
function ScrollHtmlWidget:onTapScrollText(arg, ges)
|
|
if BD.flipIfMirroredUILayout(ges.pos.x < Screen:getWidth()/2) then
|
|
return self:onScrollUp()
|
|
else
|
|
return self:onScrollDown()
|
|
end
|
|
end
|
|
|
|
function ScrollHtmlWidget:onScrollUp()
|
|
if self.htmlbox_widget.page_number > 1 then
|
|
self:scrollText(-1)
|
|
return true
|
|
end
|
|
-- if we couldn't scroll (because we're already at top or bottom),
|
|
-- let it propagate up (e.g. for quickdictlookup to go to next/prev result)
|
|
end
|
|
|
|
function ScrollHtmlWidget:onScrollDown()
|
|
if self.htmlbox_widget.page_number < self.htmlbox_widget.page_count then
|
|
self:scrollText(1)
|
|
return true
|
|
end
|
|
-- if we couldn't scroll (because we're already at top or bottom),
|
|
-- let it propagate up (e.g. for quickdictlookup to go to next/prev result)
|
|
end
|
|
|
|
return ScrollHtmlWidget
|