mirror of
https://github.com/koreader/koreader
synced 2024-11-10 01:10:34 +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.
49 lines
1.4 KiB
Lua
49 lines
1.4 KiB
Lua
local InputContainer = require("ui/widget/container/inputcontainer")
|
|
local Device = require("device")
|
|
local _ = require("gettext")
|
|
|
|
local ReaderPanning = InputContainer:extend{
|
|
-- defaults
|
|
panning_steps = {
|
|
normal = 50,
|
|
alt = 25,
|
|
shift = 10,
|
|
altshift = 5
|
|
},
|
|
}
|
|
|
|
function ReaderPanning:init()
|
|
if Device:hasKeyboard() then
|
|
self.key_events = {
|
|
-- these will all generate the same event, just with different arguments
|
|
MoveUp = {
|
|
{ "Up" }, doc = "move visible area up",
|
|
event = "Panning", args = {0, -1} },
|
|
MoveDown = {
|
|
{ "Down" }, doc = "move visible area down",
|
|
event = "Panning", args = {0, 1} },
|
|
MoveLeft = {
|
|
{ "Left" }, doc = "move visible area left",
|
|
event = "Panning", args = {-1, 0} },
|
|
MoveRight = {
|
|
{ "Right" }, doc = "move visible area right",
|
|
event = "Panning", args = {1, 0} },
|
|
}
|
|
end
|
|
end
|
|
|
|
function ReaderPanning:onSetDimensions(dimensions)
|
|
self.dimen = dimensions
|
|
end
|
|
|
|
function ReaderPanning:onPanning(args, _)
|
|
local dx, dy = unpack(args)
|
|
-- for now, bounds checking/calculation is done in the view
|
|
self.view:PanningUpdate(
|
|
dx * self.panning_steps.normal * self.dimen.w / 100,
|
|
dy * self.panning_steps.normal * self.dimen.h / 100)
|
|
return true
|
|
end
|
|
|
|
return ReaderPanning
|