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

MenuSorter: initial implementation

Browse Source 
* Menus are now sanely configurable
* Custom separator placement for clearer menus
This commit is contained in:
Frans de Jonge
2017-02-28 22:46:32 +01:00
parent f2f0c376fa
commit 5b20106db7
33 changed files with 490 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,7 +203,7 @@ function TouchMenuBar:init()
local icon_sep = LineWidget:new{
style = k == 1 and "solid" or "none",
dimen = Geom:new{
w = Screen:scaleBySize(2),
w = icon_sep_width,
h = self.height,
}
}
@@ -437,19 +437,26 @@ function TouchMenu:updateItems()
-- calculate index in item_table
local i = (self.page - 1) * self.perpage + c
if i <= #self.item_table then
local item_tmp = TouchMenuItem:new{
item = self.item_table[i],
menu = self,
dimen = Geom:new{
w = self.item_width,
h = self.item_height,
},
show_parent = self.show_parent,
}
table.insert(self.item_group, item_tmp)
-- insert split line
if c ~= self.perpage then
table.insert(self.item_group, self.split_line)
local item = self.item_table[i]
-- due to the menu ordering system index can be missing
if item then
if item.text == "KOMenu:separator" then
if c ~= self.perpage then
-- insert split line
table.insert(self.item_group, self.split_line)
end
else
local item_tmp = TouchMenuItem:new{
item = item,
menu = self,
dimen = Geom:new{
w = self.item_width,
h = self.item_height,
},
show_parent = self.show_parent,
}
table.insert(self.item_group, item_tmp)
end
end
else
-- item not enough to fill the whole page, break out of loop