2013-10-18 20:38:07 +00:00
|
|
|
local InputContainer = require("ui/widget/container/inputcontainer")
|
2014-10-30 18:42:18 +00:00
|
|
|
local Device = require("device")
|
2013-10-18 20:38:07 +00:00
|
|
|
local _ = require("gettext")
|
|
|
|
|
Clarify our OOP semantics across the codebase (#9586)
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.
2022-10-06 00:14:48 +00:00
|
|
|
local ReaderPanning = InputContainer:extend{
|
2014-03-13 13:52:43 +00:00
|
|
|
-- defaults
|
|
|
|
panning_steps = {
|
|
|
|
normal = 50,
|
|
|
|
alt = 25,
|
|
|
|
shift = 10,
|
|
|
|
altshift = 5
|
|
|
|
},
|
2012-05-18 22:50:26 +00:00
|
|
|
}
|
|
|
|
|
2012-12-31 03:57:23 +00:00
|
|
|
function ReaderPanning:init()
|
2022-11-01 22:22:07 +00:00
|
|
|
self:registerKeyEvents()
|
2022-10-31 23:17:25 +00:00
|
|
|
-- NOP our own gesture handling
|
|
|
|
self.ges_events = nil
|
|
|
|
end
|
|
|
|
|
|
|
|
function ReaderPanning:onGesture() end
|
|
|
|
|
2022-11-01 22:22:07 +00:00
|
|
|
function ReaderPanning:registerKeyEvents()
|
2016-02-14 21:47:36 +00:00
|
|
|
if Device:hasKeyboard() then
|
2014-03-13 13:52:43 +00:00
|
|
|
self.key_events = {
|
|
|
|
-- these will all generate the same event, just with different arguments
|
|
|
|
MoveUp = {
|
2022-10-27 00:01:51 +00:00
|
|
|
{ "Up" },
|
|
|
|
event = "Panning",
|
|
|
|
args = {0, -1}
|
|
|
|
},
|
2014-03-13 13:52:43 +00:00
|
|
|
MoveDown = {
|
2022-10-27 00:01:51 +00:00
|
|
|
{ "Down" },
|
|
|
|
event = "Panning",
|
|
|
|
args = {0, 1}
|
|
|
|
},
|
2014-03-13 13:52:43 +00:00
|
|
|
MoveLeft = {
|
2022-10-27 00:01:51 +00:00
|
|
|
{ "Left" },
|
|
|
|
event = "Panning",
|
|
|
|
args = {-1, 0}
|
|
|
|
},
|
2014-03-13 13:52:43 +00:00
|
|
|
MoveRight = {
|
2022-10-27 00:01:51 +00:00
|
|
|
{ "Right" },
|
|
|
|
event = "Panning",
|
|
|
|
args = {1, 0}
|
|
|
|
},
|
2014-03-13 13:52:43 +00:00
|
|
|
}
|
|
|
|
end
|
2012-12-31 03:57:23 +00:00
|
|
|
end
|
|
|
|
|
2022-10-31 23:17:25 +00:00
|
|
|
ReaderPanning.onPhysicalKeyboardConnected = ReaderPanning.registerKeyEvents
|
2022-10-30 22:05:04 +00:00
|
|
|
|
2016-12-29 08:10:38 +00:00
|
|
|
function ReaderPanning:onPanning(args, _)
|
2014-03-13 13:52:43 +00:00
|
|
|
local dx, dy = unpack(args)
|
|
|
|
-- for now, bounds checking/calculation is done in the view
|
|
|
|
self.view:PanningUpdate(
|
2022-10-31 01:24:53 +00:00
|
|
|
dx * self.panning_steps.normal * self.view.visible_area.w * (1/100),
|
|
|
|
dy * self.panning_steps.normal * self.view.visible_area.h * (1/100))
|
2014-03-13 13:52:43 +00:00
|
|
|
return true
|
2012-05-18 22:50:26 +00:00
|
|
|
end
|
2013-10-18 20:38:07 +00:00
|
|
|
|
|
|
|
return ReaderPanning
|