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

Clarify our OOP semantics across the codebase (#9586)

Browse Source 
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.
This commit is contained in:
NiLuJe
2022-10-06 02:14:48 +02:00
committed by GitHub
parent 7b9f02e1ac
commit fadee1f5dc
223 changed files with 849 additions and 985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/ui/widget/sortwidget.lua
View File

@@ -26,7 +26,7 @@ local util = require("util")
local T = require("ffi/util").template
local _ = require("gettext")
local SortItemWidget = InputContainer:new{
local SortItemWidget = InputContainer:extend{
item = nil,
face = Font:getFace("smallinfofont"),
width = nil,
@@ -34,7 +34,7 @@ local SortItemWidget = InputContainer:new{
}
function SortItemWidget:init()
self.dimen = Geom:new{w = self.width, h = self.height}
self.dimen = Geom:new{x = 0, y = 0, w = self.width, h = self.height}
self.ges_events.Tap = {
GestureRange:new{
ges = "tap",
@@ -116,7 +116,7 @@ function SortItemWidget:onHold()
return true
end
local SortWidget = FocusManager:new{
local SortWidget = FocusManager:extend{
title = "",
width = nil,
height = nil,
@@ -135,6 +135,8 @@ function SortWidget:init()
self.orig_item_table = nil
self.dimen = Geom:new{
x = 0,
y = 0,
w = self.width or Screen:getWidth(),
h = self.height or Screen:getHeight(),
}