GabrielTofvesson/cc-utilities
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Base bottomBar width on state max width

Browse Source
This commit is contained in:
Gabriel Tofvesson 2024-10-13 16:04:14 +02:00
parent 6f606d3758
commit ab65943ee0
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
itemcontroller.lua
View File

@ -10,7 +10,7 @@ local Element = require("gfx.element")
local Progress = require("gfx.progress") local Progress = require("gfx.progress")
local Prop = require("gfx.prop") local Prop = require("gfx.prop")
local Children = require("gfx.prop.children") local Children = require("gfx.prop.children")
local Visibility = require("gfx.prop.visibility") --local Visibility = require("gfx.prop.visibility")
local Orientation = require("gfx.prop.orientation") local Orientation = require("gfx.prop.orientation")
@ -232,6 +232,7 @@ local function renderDefault(state, rootElement)
-- Trigger re-render -- Trigger re-render
rootElement:setDirty(true) rootElement:setDirty(true)
rootElement:_reload()
end end
end end
@ -266,7 +267,7 @@ local PAGES = {
local pageState = state:currentPageState({ local pageState = state:currentPageState({
sortMode = 1, sortMode = 1,
filter = "", filter = "",
displayKeyboard = Visibility.INVISIBLE, displayKeyboard = true,
currentPage = 1 currentPage = 1
}) })
@ -434,7 +435,7 @@ local PAGES = {
} }
for i=#actions+1,1,-1 do for i=#actions+1,1,-1 do
table.insert(actions, i, Element:new{ width = 0, height = 1 }) table.insert(actions, i, Element:new{ width = 0 })
end end
local bottomBarList = List:new { local bottomBarList = List:new {
@ -452,7 +453,7 @@ local PAGES = {
usedSpace = usedSpace + actions[i]:getWidth() usedSpace = usedSpace + actions[i]:getWidth()
end end
local barWidth = bottomBarList:getWidth() local barWidth = state.width
local freeSpace = barWidth - usedSpace local freeSpace = barWidth - usedSpace
local asymmetry = freeSpace % ((#actions + 1) / 2) local asymmetry = freeSpace % ((#actions + 1) / 2)
local part = (freeSpace - asymmetry) / ((#actions + 1) / 2) local part = (freeSpace - asymmetry) / ((#actions + 1) / 2)
@ -488,26 +489,22 @@ local PAGES = {
local bgColor = (i % 2 == 0) and colors.gray or colors.black local bgColor = (i % 2 == 0) and colors.gray or colors.black
table.insert( table.insert(
entries, entries,
Prop.attach( List:new{
List:new{ id = tostring(i),
id = tostring(i), bgColor = bgColor,
bgColor = bgColor, [Orientation:getId()] = Orientation.HORIZONTAL,
[Orientation:getId()] = Orientation.HORIZONTAL, [Children:getId()] = {
[Children:getId()] = { Padding:new{
Padding:new{ id = GroupEntryID.PADDING,
id = GroupEntryID.PADDING, bgColor = bgColor,
bgColor = bgColor, element = Text:new{ id = GroupEntryID.NAME, bgColor = bgColor }
element = Text:new{ id = GroupEntryID.NAME, bgColor = bgColor } },
}, Text:new{
Text:new{ id = GroupEntryID.COUNT,
id = GroupEntryID.COUNT, bgColor = bgColor
bgColor = bgColor
}
} }
}, }
Visibility, }
Visibility.INVISIBLE
)
) )
end end
@ -566,7 +563,7 @@ local PAGES = {
table.insert(keyboardLines.elements, keyLineList) table.insert(keyboardLines.elements, keyLineList)
end end
table.insert(keyboardLines.elements, 1, Text:new{ id = ID_FILTER_DISPLAY, text = "" }) table.insert(keyboardLines.elements, 1, Text:new{ id = ID_FILTER_DISPLAY })
local keyboardList = Padding:new{ bgColor = colors.cyan, left = KEYBOARD_HPAD, right = KEYBOARD_HPAD, element = List:new{ local keyboardList = Padding:new{ bgColor = colors.cyan, left = KEYBOARD_HPAD, right = KEYBOARD_HPAD, element = List:new{
[Orientation:getId()] = Orientation.Vertical, [Orientation:getId()] = Orientation.Vertical,
@ -576,7 +573,7 @@ local PAGES = {
local screenContainer = Container:new{ local screenContainer = Container:new{
[Children:getId()] = { [Children:getId()] = {
mainList, mainList,
Prop.attach(keyboardList, Visibility, pageState.displayKeyboard) keyboardList
} }
} }