From 942c6a6a7f4cb8c1ed32c3df7ca3b380991f7b5e Mon Sep 17 00:00:00 2001 From: Vati Date: Wed, 18 Mar 2026 01:48:46 +0400 Subject: [PATCH] fix: footer height --- Core/Theme.lua | 6 +++--- UI/BankFrame.lua | 7 ++++++- UI/FrameHelpers.lua | 8 +++++++- UI/ItemButton.lua | 18 +++++++++++++++--- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/Core/Theme.lua b/Core/Theme.lua index b003dfa..1511c2b 100644 --- a/Core/Theme.lua +++ b/Core/Theme.lua @@ -153,10 +153,10 @@ function Theme:GetFramePadding() frameExtra = 10, -- added to containerWidth for frame width titleHeight = 28, searchBarHeight = 28, - footerHeight = 35, + footerHeight = 55, footerHiddenHeight = 5, startX = 10, - startY = -2, + startY = -5, } else return { @@ -164,7 +164,7 @@ function Theme:GetFramePadding() frameExtra = 20, titleHeight = 40, searchBarHeight = 30, - footerHeight = 45, + footerHeight = 55, footerHiddenHeight = 10, startX = 10, startY = -2, diff --git a/UI/BankFrame.lua b/UI/BankFrame.lua index 953b297..ece4b25 100644 --- a/UI/BankFrame.lua +++ b/UI/BankFrame.lua @@ -1268,7 +1268,12 @@ function BankFrame:ResizeFrame(currentRow, currentCol, columns, overrideHeight) local spacing = addon.Modules.DB:GetSetting("iconSpacing") or addon.Constants.BUTTON_SPACING -- Calculate actual number of rows used - local totalRows = (currentRow or 0) + 1 + -- if col==0, row was already incremented (full row), so totalRows = row + -- if col>0, partial row, so totalRows = row + 1 + local totalRows = (currentRow or 0) + if (currentCol or 0) > 0 then + totalRows = totalRows + 1 + end if totalRows < 1 then totalRows = 1 end diff --git a/UI/FrameHelpers.lua b/UI/FrameHelpers.lua index 09560e3..60e3c2f 100644 --- a/UI/FrameHelpers.lua +++ b/UI/FrameHelpers.lua @@ -422,7 +422,13 @@ function Guda_ResizeFrame(frameName, containerName, currentRow, currentCol, colu local buttonSize = addon.Modules.DB:GetSetting("iconSize") or addon.Constants.BUTTON_SIZE local spacing = addon.Modules.DB:GetSetting("iconSpacing") or addon.Constants.BUTTON_SPACING - local totalRows = (currentRow or 0) + 1 + -- currentRow/currentCol reflect position after last item: + -- if col==0, row was already incremented (full row), so totalRows = row + -- if col>0, partial row, so totalRows = row + 1 + local totalRows = (currentRow or 0) + if (currentCol or 0) > 0 then + totalRows = totalRows + 1 + end if totalRows < 1 then totalRows = 1 end -- Get theme-aware padding diff --git a/UI/ItemButton.lua b/UI/ItemButton.lua index b1fdfe7..680f1b9 100644 --- a/UI/ItemButton.lua +++ b/UI/ItemButton.lua @@ -350,6 +350,14 @@ end -- Show inner shadow with a given quality color local function ShowInnerShadow(shadow, r, g, b) if not shadow then return end + -- Skip inner glow in square/pfUI style + if addon.Modules and addon.Modules.Theme and addon.Modules.Theme:GetSlotStyle() == "square" then + shadow.top:Hide() + shadow.bottom:Hide() + shadow.left:Hide() + shadow.right:Hide() + return + end local a = INNER_SHADOW_ALPHA shadow.top:SetGradientAlpha("VERTICAL", r, g, b, 0, r, g, b, a) shadow.top:Show() @@ -1818,13 +1826,17 @@ function Guda_ItemButton_SetItem(self, bagID, slotID, itemData, isBank, otherCha if not self.categoryMarkIcon then self.categoryMarkIcon = self:CreateTexture(nil, "OVERLAY", 7) end - local markSize = math.max(10, math.floor(iconSize * 0.3)) + 3 + local markSize = math.max(10, math.floor(iconSize * 0.3)) + 6 self.categoryMarkIcon:SetWidth(markSize) self.categoryMarkIcon:SetHeight(markSize) self.categoryMarkIcon:ClearAllPoints() - self.categoryMarkIcon:SetPoint("BOTTOMLEFT", anchor, "BOTTOMLEFT", 2, 2) + local markOffX, markOffY = 2, 2 + if addon.Modules and addon.Modules.Theme and addon.Modules.Theme:GetSlotStyle() == "square" then + markOffX, markOffY = -2, -2 + end + self.categoryMarkIcon:SetPoint("BOTTOMLEFT", anchor, "BOTTOMLEFT", markOffX, markOffY) self.categoryMarkIcon:SetTexture(categoryMarkTexture) - self.categoryMarkIcon:SetVertexColor(1, 1, 1, 1) + self.categoryMarkIcon:SetVertexColor(0.85, 0.65, 0.13, 1) self.categoryMarkIcon:SetAlpha(1) self.categoryMarkIcon:Show() else