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

[UX] Smaller top menu icons (#3253)

Browse Source
This commit is contained in:
Frans de Jonge
2017-09-23 22:01:30 +02:00
committed by GitHub
parent 87cf2864d9
commit 36478262bf
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/ui/widget/iconbutton.lua
View File

@@ -14,6 +14,8 @@ local IconButton = InputContainer:new{
dimen = nil,
-- show_parent is used for UIManager:setDirty, so we can trigger repaint
show_parent = nil,
width = nil,
height = nil,
scale_for_dpi = true,
horizontal_padding = 0,
callback = function() end,
@@ -23,6 +25,8 @@ function IconButton:init()
self.image = ImageWidget:new{
file = self.icon_file,
scale_for_dpi = self.scale_for_dpi,
width = self.width,
height = self.height,
}
self.show_parent = self.show_parent or self

12
frontend/ui/widget/touchmenu.lua
View File

@@ -162,12 +162,13 @@ function TouchMenuBar:init()
local icon_sep_width = Size.span.vertical_default
local icons_sep_width = icon_sep_width * (#self.icons + 1)
-- we assume all icons are of the same width
local tmp_ib = IconButton:new{icon_file = self.icons[1]}
local icon_width = Screen:scaleBySize(40)
local icon_height = icon_width
-- content_width is the width of all the icon images
local content_width = tmp_ib:getSize().w * #self.icons + icons_sep_width
local content_width = icon_width * #self.icons + icons_sep_width
local spacing_width = (self.width - content_width)/(#self.icons*2)
local icon_padding = math.min(spacing_width, Screen:scaleBySize(20))
self.height = tmp_ib:getSize().h + Screen:scaleBySize(10)
local icon_padding = math.min(spacing_width, Screen:scaleBySize(16))
self.height = icon_height + Size.span.vertical_large
self.show_parent = self.show_parent or self
self.bar_icon_group = HorizontalGroup:new{}
-- build up image widget for menu icon bar
@@ -187,6 +188,9 @@ function TouchMenuBar:init()
local ib = IconButton:new{
show_parent = self.show_parent,
icon_file = v,
width = icon_width,
height = icon_height,
scale_for_dpi = false,
callback = nil,
horizontal_padding = icon_padding,
}