Fixed more alignment issues

Cidan · Dec 2, 2023 · 0131286 · 0131286
1 parent 2e63885
commit 0131286
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/frames/bag.lua b/frames/bag.lua
@@ -299,7 +299,6 @@ function bagFrame:Create(kind)
   bottomBar:SetPoint("BOTTOMRIGHT", b.frame, "BOTTOMRIGHT", const.OFFSETS.BOTTOM_BAR_RIGHT_INSET, const.OFFSETS.BOTTOM_BAR_BOTTOM_INSET)
   bottomBar:SetHeight(20)
   bottomBar:Show()
-  debug:DrawBorder(bottomBar, 0, 1, 0.5)
   b.bottomBar = bottomBar
 
   -- Create the money frame only in the player backpack bag.
@@ -428,8 +427,6 @@ function bagFrame:Create(kind)
     database:SetBagViewFrameSize(b.kind, database:GetBagView(b.kind), fw, fh)
   end)
 
-  debug:DrawBorder(b.content:GetContainer(), 1, 0.5, 0)
-  --debug:DrawBorder(b.content:GetScrollView(), 0, 1, 0.5)
   return b
 end
 

diff --git a/frames/column.lua b/frames/column.lua
@@ -153,7 +153,6 @@ function columnFrame:_DoCreate()
   column.minimumWidth = 0
   column.cells = {}
   column.frame:Show()
-  --debug:DrawBorder(column.frame, 1, 0, 0)
   return column
 end
 

diff --git a/views/gridview.lua b/views/gridview.lua
@@ -159,5 +159,8 @@ function views:GridView(bag, dirtyItems)
   --TODO(lobato): Implement SafeSetSize that prevents the window from being larger
   -- than the screen space.
   bag.frame:SetWidth(w + 12)
-  bag.frame:SetHeight(h + bag.bottomBar:GetHeight())
+  local bagHeight = h +
+  const.OFFSETS.BAG_BOTTOM_INSET + -const.OFFSETS.BAG_TOP_INSET +
+  const.OFFSETS.BOTTOM_BAR_HEIGHT + const.OFFSETS.BOTTOM_BAR_BOTTOM_INSET
+  bag.frame:SetHeight(bagHeight)
 end
diff --git a/views/oneview.lua b/views/oneview.lua
@@ -80,5 +80,8 @@ function views:OneBagView(bag, dirtyItems)
   local w, h = bag.content:Draw()
   bag.content:HideScrollBar()
   bag.frame:SetWidth(w + 12)
-  bag.frame:SetHeight(h + 28 + bag.bottomBar:GetHeight())
+  local bagHeight = h +
+  const.OFFSETS.BAG_BOTTOM_INSET + -const.OFFSETS.BAG_TOP_INSET +
+  const.OFFSETS.BOTTOM_BAR_HEIGHT + const.OFFSETS.BOTTOM_BAR_BOTTOM_INSET
+  bag.frame:SetHeight(bagHeight)
 end