mirror of
https://github.com/koreader/koreader
synced 2024-11-10 01:10:34 +00:00
[UX] Add CheckMark and use in TouchMenu checkable indicator
Uses `✓` overlaid on `▢` to create the checkbox.
This commit is contained in:
parent
7376c57ceb
commit
cda148e4b7
50
frontend/ui/widget/checkmark.lua
Normal file
50
frontend/ui/widget/checkmark.lua
Normal file
@ -0,0 +1,50 @@
|
||||
--[[--
|
||||
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 Font = require("ui/font")
|
||||
local InputContainer = require("ui/widget/container/inputcontainer")
|
||||
local OverlapGroup = require("ui/widget/overlapgroup")
|
||||
local TextWidget = require("ui/widget/textwidget")
|
||||
|
||||
local CheckMark = InputContainer:new{
|
||||
checkable = true,
|
||||
checked = false,
|
||||
face = Font:getFace("smallinfofont"),
|
||||
width = 0,
|
||||
height = 0,
|
||||
}
|
||||
|
||||
function CheckMark:init()
|
||||
local checked_widget = TextWidget:new{
|
||||
text = " ✓",
|
||||
face = self.face,
|
||||
}
|
||||
local unchecked_widget = TextWidget:new{
|
||||
text = "▢ ",
|
||||
face = self.face,
|
||||
}
|
||||
local empty_widget = TextWidget:new{
|
||||
text = "",
|
||||
face = self.face,
|
||||
}
|
||||
self[1] = self.checkable and OverlapGroup:new{
|
||||
(self.checked and checked_widget or empty_widget),
|
||||
unchecked_widget
|
||||
}
|
||||
or empty_widget
|
||||
end
|
||||
|
||||
return CheckMark
|
@ -1,6 +1,7 @@
|
||||
local Blitbuffer = require("ffi/blitbuffer")
|
||||
local Button = require("ui/widget/button")
|
||||
local CenterContainer = require("ui/widget/container/centercontainer")
|
||||
local CheckMark = require("ui/widget/checkmark")
|
||||
local Device = require("device")
|
||||
local Font = require("ui/font")
|
||||
local FrameContainer = require("ui/widget/container/framecontainer")
|
||||
@ -56,17 +57,20 @@ function TouchMenuItem:init()
|
||||
if self.item.enabled_func then
|
||||
item_enabled = self.item.enabled_func()
|
||||
end
|
||||
local item_checkable = false
|
||||
local item_checked = self.item.checked
|
||||
if self.item.checked_func then
|
||||
item_checkable = true
|
||||
item_checked = self.item.checked_func()
|
||||
end
|
||||
local checked_widget = TextWidget:new{
|
||||
text = "√ ",
|
||||
face = self.face,
|
||||
local checked_widget = CheckMark:new{
|
||||
checked = true,
|
||||
}
|
||||
local unchecked_widget = TextWidget:new{
|
||||
text = "",
|
||||
face = self.face,
|
||||
local unchecked_widget = CheckMark:new{
|
||||
checked = false,
|
||||
}
|
||||
local empty_widget = CheckMark:new{
|
||||
checkable = false,
|
||||
}
|
||||
self.item_frame = FrameContainer:new{
|
||||
width = self.dimen.w,
|
||||
@ -76,7 +80,11 @@ function TouchMenuItem:init()
|
||||
align = "center",
|
||||
CenterContainer:new{
|
||||
dimen = Geom:new{ w = checked_widget:getSize().w },
|
||||
item_checked and checked_widget or unchecked_widget
|
||||
item_checkable and (
|
||||
item_checked and checked_widget
|
||||
or unchecked_widget
|
||||
)
|
||||
or empty_widget
|
||||
},
|
||||
TextWidget:new{
|
||||
text = getMenuText(self.item),
|
||||
|
Loading…
Reference in New Issue
Block a user