|
|
@ -438,22 +438,19 @@ function TouchMenu:updateItems()
|
|
|
|
local i = (self.page - 1) * self.perpage + c
|
|
|
|
local i = (self.page - 1) * self.perpage + c
|
|
|
|
if i <= #self.item_table then
|
|
|
|
if i <= #self.item_table then
|
|
|
|
local item = self.item_table[i]
|
|
|
|
local item = self.item_table[i]
|
|
|
|
-- due to the menu ordering system index can be missing
|
|
|
|
local item_tmp = TouchMenuItem:new{
|
|
|
|
if item then
|
|
|
|
item = item,
|
|
|
|
local item_tmp = TouchMenuItem:new{
|
|
|
|
menu = self,
|
|
|
|
item = item,
|
|
|
|
dimen = Geom:new{
|
|
|
|
menu = self,
|
|
|
|
w = self.item_width,
|
|
|
|
dimen = Geom:new{
|
|
|
|
h = self.item_height,
|
|
|
|
w = self.item_width,
|
|
|
|
},
|
|
|
|
h = self.item_height,
|
|
|
|
show_parent = self.show_parent,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
show_parent = self.show_parent,
|
|
|
|
table.insert(self.item_group, item_tmp)
|
|
|
|
}
|
|
|
|
if item.separator and c ~= self.perpage then
|
|
|
|
table.insert(self.item_group, item_tmp)
|
|
|
|
-- insert split line
|
|
|
|
if item.separator and c ~= self.perpage then
|
|
|
|
table.insert(self.item_group, self.split_line)
|
|
|
|
-- insert split line
|
|
|
|
|
|
|
|
table.insert(self.item_group, self.split_line)
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
else
|
|
|
|
else
|
|
|
|
-- item not enough to fill the whole page, break out of loop
|
|
|
|
-- item not enough to fill the whole page, break out of loop
|
|
|
|