mirror of
https://github.com/koreader/koreader
synced 2024-11-04 12:00:25 +00:00
ScrollableContainer: fix 'argc' (#9680)
This commit is contained in:
hius07
GitHub
parent
724db87755
commit
1d9c81de6e
@ -91,6 +91,7 @@ function CheckButton:initCheckButton(checked)
|
||||
background = self.background,
|
||||
margin = 0,
|
||||
padding = 0,
|
||||
show_parent = self.show_parent or self,
|
||||
self._horizontalgroup,
|
||||
}
|
||||
self.dimen = self._frame:getSize()
|
||||
|
||||
@ -319,7 +319,7 @@ function ScrollableContainer:propagateEvent(event)
|
||||
-- pass-through
|
||||
return InputContainer.propagateEvent(self, event)
|
||||
end
|
||||
if event.handler == "onGesture" and event.argc == 1 then
|
||||
if event.handler == "onGesture" and #event.args == 1 then
|
||||
local ges = event.args[1]
|
||||
-- Don't propagate events that happen out of view (in the hidden
|
||||
-- scrolled-out area) to child
|
||||
|
||||
@ -165,7 +165,6 @@ function KeyboardLayoutDialog:init()
|
||||
w = Screen:getWidth(),
|
||||
h = Screen:getHeight(),
|
||||
},
|
||||
ignore_if_over = "height",
|
||||
self.movable,
|
||||
}
|
||||
if Device:hasKeys() then
|
||||
|
||||
@ -1,210 +0,0 @@
|
||||
--[[--
|
||||
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 HorizontalGroup = require("ui/widget/horizontalgroup")
|
||||
local InputContainer = require("ui/widget/container/inputcontainer")
|
||||
local LeftContainer = require("ui/widget/container/leftcontainer")
|
||||
local TextBoxWidget = require("ui/widget/textboxwidget")
|
||||
local TextWidget = require("ui/widget/textwidget")
|
||||
local UIManager = require("ui/uimanager")
|
||||
|
||||
local RadioButton = InputContainer:extend{
|
||||
checkable = true,
|
||||
checked = false,
|
||||
enabled = true,
|
||||
face = Font:getFace("smallinfofont"),
|
||||
background = Blitbuffer.COLOR_WHITE,
|
||||
width = 0,
|
||||
height = 0,
|
||||
}
|
||||
|
||||
function RadioButton:init()
|
||||
local fgcolor = self.enabled and Blitbuffer.COLOR_BLACK or Blitbuffer.COLOR_DARK_GRAY
|
||||
local dummy_widget = TextWidget:new{ -- to get width of radiomark
|
||||
text = "◉ ",
|
||||
face = self.face,
|
||||
}
|
||||
local radiomark_width = dummy_widget:getSize().w
|
||||
dummy_widget:free()
|
||||
local text_widget = TextBoxWidget:new{
|
||||
text = self.text,
|
||||
face = self.face,
|
||||
width = self.max_width - radiomark_width,
|
||||
fgcolor = fgcolor,
|
||||
}
|
||||
local checked_widget = TextBoxWidget:new{
|
||||
text = "◉ ",
|
||||
face = self.face,
|
||||
width = radiomark_width,
|
||||
fgcolor = fgcolor,
|
||||
}
|
||||
local unchecked_widget = TextBoxWidget:new{
|
||||
text = "◯ ",
|
||||
face = self.face,
|
||||
width = radiomark_width,
|
||||
fgcolor = fgcolor,
|
||||
}
|
||||
local empty_widget = TextBoxWidget:new{
|
||||
text = "",
|
||||
face = self.face,
|
||||
width = radiomark_width,
|
||||
fgcolor = fgcolor,
|
||||
}
|
||||
self._checked_widget = HorizontalGroup:new{
|
||||
align = "top",
|
||||
checked_widget,
|
||||
text_widget,
|
||||
}
|
||||
self._unchecked_widget = HorizontalGroup:new{
|
||||
align = "top",
|
||||
unchecked_widget,
|
||||
text_widget,
|
||||
}
|
||||
self._empty_widget = HorizontalGroup:new{
|
||||
align = "top",
|
||||
empty_widget,
|
||||
text_widget,
|
||||
}
|
||||
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()
|
||||
self.frame = FrameContainer:new{
|
||||
margin = self.margin,
|
||||
bordersize = self.bordersize,
|
||||
background = self.background,
|
||||
radius = self.radius,
|
||||
padding = self.padding,
|
||||
show_parent = self.show_parent,
|
||||
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
|
||||
-- c.f., ui/widget/iconbutton for the canonical documentation about the flash_ui code flow
|
||||
|
||||
-- Highlight
|
||||
--
|
||||
-- self.frame's width is based on self.width, so we effectively flash the full width, not only the button/text's width.
|
||||
-- This matches the behavior of Menu & TouchMenu.
|
||||
self.frame.invert = true
|
||||
UIManager:widgetInvert(self.frame, self.dimen.x, self.dimen.y)
|
||||
UIManager:setDirty(nil, "fast", self.dimen)
|
||||
|
||||
UIManager:forceRePaint()
|
||||
UIManager:yieldToEPDC()
|
||||
|
||||
-- Unhighlight
|
||||
--
|
||||
self.frame.invert = false
|
||||
UIManager:widgetInvert(self.frame, self.dimen.x, self.dimen.y)
|
||||
UIManager:setDirty(nil, "ui", self.dimen)
|
||||
|
||||
-- Callback
|
||||
--
|
||||
self.callback()
|
||||
|
||||
UIManager:forceRePaint()
|
||||
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:widgetRepaint(self.frame, self.dimen.x, self.dimen.y)
|
||||
UIManager:setDirty(nil, "ui", self.dimen)
|
||||
end
|
||||
|
||||
function RadioButton:unCheck()
|
||||
self._radio_button = self._unchecked_widget
|
||||
self.checked = false
|
||||
self:update()
|
||||
UIManager:widgetRepaint(self.frame, self.dimen.x, self.dimen.y)
|
||||
UIManager:setDirty(nil, "ui", self.dimen)
|
||||
end
|
||||
|
||||
return RadioButton
|
||||
Loading…
Reference in New Issue
Block a user