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

ButtonTable: taller buttons for easier tap (#5554)

Browse Source
This commit is contained in:
poire-z
2019-11-01 01:52:05 +01:00
committed by GitHub
parent 602a821acc
commit eb8795e4e0
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/ui/size.lua
View File

@@ -50,6 +50,7 @@ local Size = {
small = Screen:scaleBySize(2),
large = Screen:scaleBySize(10),
button = Screen:scaleBySize(2),
buttontable = Screen:scaleBySize(4),
fullscreen = Screen:scaleBySize(15),
},
radius = {

16
frontend/ui/widget/button.lua
View File

@@ -41,6 +41,8 @@ local Button = InputContainer:new{
background = Blitbuffer.COLOR_WHITE,
radius = Size.radius.button,
padding = Size.padding.button,
padding_h = nil,
padding_v = nil,
width = nil,
max_width = nil,
text_font_face = "cfont",
@@ -54,10 +56,17 @@ function Button:init()
self.text = self.text_func()
end
if not self.padding_h then
self.padding_h = self.padding
end
if not self.padding_v then
self.padding_v = self.padding
end
if self.text then
self.label_widget = TextWidget:new{
text = self.text,
max_width = self.max_width and self.max_width - 2*self.padding - 2*self.margin - 2*self.bordersize or nil,
max_width = self.max_width and self.max_width - 2*self.padding_h - 2*self.margin - 2*self.bordersize or nil,
fgcolor = self.enabled and Blitbuffer.COLOR_BLACK or Blitbuffer.COLOR_DARK_GRAY,
bold = self.text_font_bold,
face = Font:getFace(self.text_font_face, self.text_font_size)
@@ -79,7 +88,10 @@ function Button:init()
bordersize = self.bordersize,
background = self.background,
radius = self.radius,
padding = self.padding,
padding_top = self.padding_v,
padding_bottom = self.padding_v,
padding_left = self.padding_h,
padding_right = self.padding_h,
CenterContainer:new{
dimen = Geom:new{
w = self.width,

3
frontend/ui/widget/buttontable.lua
View File

@@ -59,7 +59,8 @@ function ButtonTable:init()
max_width = (self.width - sizer_space)/column_cnt - 2*self.sep_width - 2*self.padding,
bordersize = 0,
margin = 0,
padding = 0,
padding = Size.padding.buttontable, -- a bit taller than standalone buttons, for easier tap
padding_h = 0, -- allow text to take more of the horizontal space
text_font_face = self.button_font_face,
text_font_size = self.button_font_size,
show_parent = self.show_parent,