GitHub/Basalt
1
0
Fork 0
Code Issues 28 Pull Requests 3 Actions Packages Projects Releases 9 Wiki Activity

Small Fix

Browse Source 
Fixed Progressbar drawing with wrong coordinates
This commit is contained in:
Robert Jelic
2023-05-06 18:46:56 +02:00
parent 2931a95c20
commit 2b2de1cddf
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Basalt/objects/Menubar.lua
View File

@@ -97,7 +97,6 @@ return function(name, basalt)
base.draw(self)
self:addDraw("list", function()
local parent = self:getParent()
local obx, oby = self:getPosition()
local w,h = self:getSize()
local text = ""
local textBGCol = ""

32
Basalt/objects/Progressbar.lua
View File

@@ -74,25 +74,25 @@ return function(name, basalt)
local obx, oby = self:getPosition()
local w,h = self:getSize()
local bgCol,fgCol = self:getBackground(), self:getForeground()
if(bgCol~=false)then self:addBackgroundBox(obx, oby, w, h, bgCol) end
if(bgBarSymbol~="")then self:addTextBox(obx, oby, w, h, bgBarSymbol) end
if(fgCol~=false)then self:addForegroundBox(obx, oby, w, h, fgCol) end
if(bgCol~=false)then self:addBackgroundBox(1, 1, w, h, bgCol) end
if(bgBarSymbol~="")then self:addTextBox(1, 1, w, h, bgBarSymbol) end
if(fgCol~=false)then self:addForegroundBox(1, 1, w, h, fgCol) end
if (direction == 1) then
self:addBackgroundBox(obx, oby, w, h / 100 * progress, activeBarColor)
self:addForegroundBox(obx, oby, w, h / 100 * progress, activeBarSymbolCol)
self:addTextBox(obx, oby, w, h / 100 * progress, activeBarSymbol)
elseif (direction == 2) then
self:addBackgroundBox(obx, oby + math.ceil(h - h / 100 * progress), w, h / 100 * progress, activeBarColor)
self:addForegroundBox(obx, oby + math.ceil(h - h / 100 * progress), w, h / 100 * progress, activeBarSymbolCol)
self:addTextBox(obx, oby + math.ceil(h - h / 100 * progress), w, h / 100 * progress, activeBarSymbol)
self:addBackgroundBox(1, 1, w, h / 100 * progress, activeBarColor)
self:addForegroundBox(1, 1, w, h / 100 * progress, activeBarSymbolCol)
self:addTextBox(1, 1, w, h / 100 * progress, activeBarSymbol)
elseif (direction == 3) then
self:addBackgroundBox(obx + math.ceil(w - w / 100 * progress), oby, w / 100 * progress, h, activeBarColor)
self:addForegroundBox(obx + math.ceil(w - w / 100 * progress), oby, w / 100 * progress, h, activeBarSymbolCol)
self:addTextBox(obx + math.ceil(w - w / 100 * progress), oby, w / 100 * progress, h, activeBarSymbol)
self:addBackgroundBox(1, 1 + math.ceil(h - h / 100 * progress), w, h / 100 * progress, activeBarColor)
self:addForegroundBox(1, 1 + math.ceil(h - h / 100 * progress), w, h / 100 * progress, activeBarSymbolCol)
self:addTextBox(1, 1 + math.ceil(h - h / 100 * progress), w, h / 100 * progress, activeBarSymbol)
elseif (direction == 2) then
self:addBackgroundBox(1 + math.ceil(w - w / 100 * progress), 1, w / 100 * progress, h, activeBarColor)
self:addForegroundBox(1 + math.ceil(w - w / 100 * progress), 1, w / 100 * progress, h, activeBarSymbolCol)
self:addTextBox(1 + math.ceil(w - w / 100 * progress), 1, w / 100 * progress, h, activeBarSymbol)
else
self:addBackgroundBox(obx, oby, w / 100 * progress, h, activeBarColor)
self:addForegroundBox(obx, oby, w / 100 * progress, h, activeBarSymbolCol)
self:addTextBox(obx, oby, w / 100 * progress, h, activeBarSymbol)
self:addBackgroundBox(1, 1, math.ceil( w / 100 * progress), h, activeBarColor)
self:addForegroundBox(1, 1, math.ceil(w / 100 * progress), h, activeBarSymbolCol)
self:addTextBox(1, 1, math.ceil(w / 100 * progress), h, activeBarSymbol)
end
end)
end,