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

Compare commits

base: GabrielTofvesson:d294355a73dfe1348683995b6762dd7758104fed
Branches Tags
GabrielTofvesson:main
..
compare: GabrielTofvesson:b5fd24740b26f9cccd5af67cdb25663fbcc755b7
Branches Tags
GabrielTofvesson:main

No commits in common. "d294355a73dfe1348683995b6762dd7758104fed" and "b5fd24740b26f9cccd5af67cdb25663fbcc755b7" have entirely different histories.
d294355a73 ... b5fd24740b

2 changed files with 5 additions and 8 deletions
Show Stats Expand all files Collapse all files

2
gfx/textprogress.lua
View File

@ -10,7 +10,7 @@ function TextProgress:setProgress(progress)
end end
function TextProgress:draw() function TextProgress:draw()
getmetatable(getmetatable(getmetatable(self))).draw(self) getmetatable(getmetatable(self)).draw(self)
local text = self:getText() local text = self:getText()
if #text == 0 then if #text == 0 then
return return

11
itemcontroller.lua
View File

@ -529,19 +529,16 @@ local PAGES = {
-- Set dynamic states for elements -- Set dynamic states for elements
sortButton:setText("<"..tostring(pageState.sortMode)..">") sortButton:setText("<"..tostring(pageState.sortMode)..">")
local totalCountStr = tostring(totalCount) local totalCountStr = tostring(totalCount)
local availCount = totalCount - emptyCount local emptyCountStr = tostring(emptyCount)
local availCountStr = tostring(availCount)
local storageSat = availCountStr / totalCount
storageSatProgress:setText( storageSatProgress:setText(
(availCountStr).. emptyCountStr..
(" "):rep(math.max(0, math.floor(state.width / 2) - #availCountStr - 1)).. (" "):rep(math.max(0, math.floor(state.width / 2) - #emptyCountStr - 1))..
"/".. "/"..
(" "):rep(math.max(0, math.ceil(state.width / 2) - #totalCountStr)).. (" "):rep(math.max(0, math.ceil(state.width / 2) - #totalCountStr))..
totalCountStr totalCountStr
) )
storageSatProgress:setProgress(storageSat) storageSatProgress:setProgress(emptyCount / totalCount)
storageSatProgress:setFgColor((storageSat <= 0.33 and colors.green) or (storageSat <= 0.66 and colors.orange) or colors.red)
local basePageIndex = (pageState.currentPage - 1) * groupEntryListBudget local basePageIndex = (pageState.currentPage - 1) * groupEntryListBudget
for i=1,groupEntryListBudget do for i=1,groupEntryListBudget do