mirror of
https://github.com/koreader/koreader
synced 2024-11-16 06:12:56 +00:00
812e595608
* Enable HW dithering on supported devices (Clara HD, Forma; Oasis 2, PW4)
* FileManager and co. (where appropriate, i.e., when covers are shown)
* Book Status
* Reader, where appropriate:
* CRe: on pages whith image content (for over 7.5% of the screen area, should hopefully leave stuff like bullet points or small scene breaks alone).
* Other engines: on user-request (in the gear tab of the bottom menu), via the new "Dithering" knob (will only appear on supported devices).
* ScreenSaver
* ImageViewer
* Minimize repaints when flash_ui is enabled (by, almost everywhere, only repainting the flashing element, and not the toplevel window which hosts it).
(The first pass of this involved fixing a few Button instances whose show_parent was wrong, in particular, chevrons in the FM & TopMenu).
* Hunted down a few redundant repaints (unneeded setDirty("all") calls),
either by switching the widget to nil when only a refresh was needed, and not a repaint,
or by passing the appropritate widget to setDirty.
(Note to self: Enable *verbose* debugging to catch broken setDirty calls via its post guard).
There were also a few instances of 'em right behind a widget close.
* Don't repaint the underlying widget when initially showing TopMenu & ConfigDialog.
We unfortunately do need to do it when switching tabs, because of their variable heights.
* On Kobo, disabled the extra and completely useless full refresh before suspend/reboot/poweroff, as well as on resume. No more double refreshes!
* Fix another debug guard in Kobo sysfs_light
* Switch ImageWidget & ImageViewer mostly to "ui" updates, which will be better suited to image content pretty much everywhere, REAGL or not.
PS: (Almost 💯 commits! :D)
172 lines
4.9 KiB
Lua
172 lines
4.9 KiB
Lua
--[[--
|
|
Widget that shows a radiobutton checked (`◉`) or unchecked (`◯`)
|
|
or nothing of the same size.
|
|
|
|
Example:
|
|
|
|
local RadioButton = require("ui/widget/radiobutton")
|
|
local parent_widget = FrameContainer:new{}
|
|
table.insert(parent_widget, RadioButton:new{
|
|
checkable = false, -- shows nothing when false, defaults to true
|
|
checked = function() end, -- whether the box is checked
|
|
})
|
|
UIManager:show(parent_widget)
|
|
|
|
]]
|
|
|
|
local Blitbuffer = require("ffi/blitbuffer")
|
|
local Device = require("device")
|
|
local Font = require("ui/font")
|
|
local FrameContainer = require("ui/widget/container/framecontainer")
|
|
local Geom = require("ui/geometry")
|
|
local GestureRange = require("ui/gesturerange")
|
|
local InputContainer = require("ui/widget/container/inputcontainer")
|
|
local LeftContainer = require("ui/widget/container/leftcontainer")
|
|
local TextWidget = require("ui/widget/textwidget")
|
|
local UIManager = require("ui/uimanager")
|
|
|
|
local RadioButton = InputContainer:new{
|
|
checkable = true,
|
|
checked = false,
|
|
enabled = true,
|
|
face = Font:getFace("smallinfofont"),
|
|
background = Blitbuffer.COLOR_WHITE,
|
|
width = 0,
|
|
height = 0,
|
|
}
|
|
|
|
function RadioButton:init()
|
|
self._checked_widget = TextWidget:new{
|
|
text = "◉ " .. self.text,
|
|
face = self.face,
|
|
max_width = self.max_width,
|
|
}
|
|
self._unchecked_widget = TextWidget:new{
|
|
text = "◯ " .. self.text,
|
|
face = self.face,
|
|
max_width = self.max_width,
|
|
}
|
|
self._empty_widget = TextWidget:new{
|
|
text = "" .. self.text,
|
|
face = self.face,
|
|
max_width = self.max_width,
|
|
}
|
|
self._widget_size = self._unchecked_widget:getSize()
|
|
if self.width == nil then
|
|
self.width = self._widget_size.w
|
|
end
|
|
self._radio_button = self.checkable
|
|
and (self.checked and self._checked_widget or self._unchecked_widget)
|
|
or self._empty_widget
|
|
self:update()
|
|
self.dimen = self.frame:getSize()
|
|
if Device:isTouchDevice() then
|
|
self.ges_events = {
|
|
TapCheckButton = {
|
|
GestureRange:new{
|
|
ges = "tap",
|
|
range = self.dimen,
|
|
},
|
|
doc = "Tap Button",
|
|
},
|
|
HoldCheckButton = {
|
|
GestureRange:new{
|
|
ges = "hold",
|
|
range = self.dimen,
|
|
},
|
|
doc = "Hold Button",
|
|
}
|
|
}
|
|
end
|
|
end
|
|
|
|
function RadioButton:update()
|
|
if self[1] then
|
|
self[1]:free()
|
|
end
|
|
self.frame = FrameContainer:new{
|
|
margin = self.margin,
|
|
bordersize = self.bordersize,
|
|
background = self.background,
|
|
radius = self.radius,
|
|
padding = self.padding,
|
|
LeftContainer:new{
|
|
dimen = Geom:new{
|
|
w = self.width,
|
|
h = self._widget_size.h
|
|
},
|
|
self._radio_button,
|
|
}
|
|
}
|
|
self[1] = self.frame
|
|
end
|
|
|
|
function RadioButton:onFocus()
|
|
self.frame.invert = true
|
|
return true
|
|
end
|
|
|
|
function RadioButton:onUnfocus()
|
|
self.frame.invert = false
|
|
return true
|
|
end
|
|
|
|
function RadioButton:onTapCheckButton()
|
|
if self.enabled and self.callback then
|
|
if G_reader_settings:isFalse("flash_ui") then
|
|
self.callback()
|
|
else
|
|
-- While I'd like to only flash the button itself, we have to make do with flashing the full width of the TextWidget...
|
|
self.frame.invert = true
|
|
UIManager:widgetRepaint(self.frame, self.dimen.x, self.dimen.y)
|
|
UIManager:setDirty(nil, function()
|
|
return "fast", self.dimen
|
|
end)
|
|
UIManager:tickAfterNext(function()
|
|
self.callback()
|
|
self.frame.invert = false
|
|
UIManager:widgetRepaint(self.frame, self.dimen.x, self.dimen.y)
|
|
UIManager:setDirty(nil, function()
|
|
return "fast", self.dimen
|
|
end)
|
|
end)
|
|
end
|
|
elseif self.tap_input then
|
|
self:onInput(self.tap_input)
|
|
elseif type(self.tap_input_func) == "function" then
|
|
self:onInput(self.tap_input_func())
|
|
end
|
|
return true
|
|
end
|
|
|
|
function RadioButton:onHoldCheckButton()
|
|
if self.enabled and self.hold_callback then
|
|
self.hold_callback()
|
|
elseif self.hold_input then
|
|
self:onInput(self.hold_input)
|
|
elseif type(self.hold_input_func) == "function" then
|
|
self:onInput(self.hold_input_func())
|
|
end
|
|
return true
|
|
end
|
|
|
|
function RadioButton:check(callback)
|
|
self._radio_button = self._checked_widget
|
|
self.checked = true
|
|
self:update()
|
|
UIManager:setDirty(self.parent, function()
|
|
return "fast", self.dimen
|
|
end)
|
|
end
|
|
|
|
function RadioButton:unCheck()
|
|
self._radio_button = self._unchecked_widget
|
|
self.checked = false
|
|
self:update()
|
|
UIManager:setDirty(self.parent, function()
|
|
return "fast", self.dimen
|
|
end)
|
|
end
|
|
|
|
return RadioButton
|