mirror of
https://github.com/koreader/koreader
synced 2024-11-10 01:10:34 +00:00
cbe7775bc8
The x and y coordinates of SortItemWidget's checkmark widgets were not updated, thus remained at their initial value 0. Consequently the intersectWith check in SortItemWidget:onTap always evaluated to false, resulting in taps on checkmarks in the sort widget not being recognized. Co-authored-by: NiLuJe <ninuje@gmail.com>
97 lines
3.1 KiB
Lua
97 lines
3.1 KiB
Lua
--[[--
|
|
Widget that shows a checkmark (`✓`), an empty box (`□`)
|
|
or nothing of the same size.
|
|
|
|
Example:
|
|
|
|
local CheckMark = require("ui/widget/CheckMark")
|
|
local parent_widget = FrameContainer:new{}
|
|
table.insert(parent_widget, CheckMark:new{
|
|
checkable = false, -- shows nothing when false, defaults to true
|
|
checked = function() end, -- whether the box has a checkmark in it
|
|
})
|
|
UIManager:show(parent_widget)
|
|
|
|
]]
|
|
|
|
local BD = require("ui/bidi")
|
|
local Blitbuffer = require("ffi/blitbuffer")
|
|
local Font = require("ui/font")
|
|
local OverlapGroup = require("ui/widget/overlapgroup")
|
|
local TextWidget = require("ui/widget/textwidget")
|
|
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
|
|
|
local CheckMark = WidgetContainer:extend{
|
|
checkable = true,
|
|
checked = false,
|
|
enabled = true,
|
|
face = Font:getFace("smallinfofont"),
|
|
width = 0,
|
|
height = 0,
|
|
baseline = 0,
|
|
}
|
|
|
|
function CheckMark:init()
|
|
-- Adjust these checkmarks if mirroring UI (para_direction_rtl should
|
|
-- follow BD.mirroredUILayout(), and not the set or reverted text
|
|
-- direction, for proper rendering on the right).
|
|
local para_direction_rtl = BD.mirroredUILayout()
|
|
local checked_widget = TextWidget:new{
|
|
text = " ✓", -- preceded by thin space for better alignment
|
|
face = self.face,
|
|
para_direction_rtl = para_direction_rtl,
|
|
}
|
|
self.baseline = checked_widget:getBaseline()
|
|
local unchecked_widget = TextWidget:new{
|
|
text = "▢ ",
|
|
face = self.face,
|
|
para_direction_rtl = para_direction_rtl,
|
|
}
|
|
local disabled_checked_widget = TextWidget:new{
|
|
text = " ✓", -- preceded by thin space for better alignment
|
|
face = self.face,
|
|
fgcolor = Blitbuffer.COLOR_DARK_GRAY,
|
|
para_direction_rtl = para_direction_rtl,
|
|
}
|
|
local disabled_unchecked_widget = TextWidget:new{
|
|
text = "▢ ",
|
|
face = self.face,
|
|
fgcolor = Blitbuffer.COLOR_DARK_GRAY,
|
|
para_direction_rtl = para_direction_rtl,
|
|
}
|
|
local empty_widget = TextWidget:new{
|
|
text = "",
|
|
face = self.face,
|
|
para_direction_rtl = para_direction_rtl,
|
|
}
|
|
local widget
|
|
if self.checkable then
|
|
if self.enabled then
|
|
widget = OverlapGroup:new{
|
|
(self.checked and checked_widget or empty_widget),
|
|
unchecked_widget
|
|
}
|
|
else
|
|
widget = OverlapGroup:new{
|
|
(self.checked and disabled_checked_widget or empty_widget),
|
|
disabled_unchecked_widget
|
|
}
|
|
end
|
|
else
|
|
widget = empty_widget
|
|
end
|
|
self[1] = widget
|
|
self.dimen = unchecked_widget:getSize()
|
|
end
|
|
|
|
function CheckMark:paintTo(bb, x, y)
|
|
-- NOTE: Account for alignment/offsets computation being tacked on to self.dimen...
|
|
-- This is dumb and probably means we're doing something wonky... somewhere, but it works,
|
|
-- and allows us to keep sensible coordinates in dimen, so that they can be used for hitbox checks.
|
|
WidgetContainer.paintTo(self, bb, x - self.dimen.x, y - self.dimen.y)
|
|
self.dimen.x = x
|
|
self.dimen.y = y
|
|
end
|
|
|
|
return CheckMark
|