Masque Integration Update (#221)

* Masque integration is now evented instead of in-line.

* Item frame resizing now resizes all properties manually.

BetterBags.toc

@@ -42,8 +42,6 @@ core\constants.lua
 core\database.lua
 core\hooks.lua
 
-theme\masque.lua
-
 data\equipmentsets.lua
 data\items.lua
 data\categories.lua
@@ -82,5 +80,6 @@ config\customcat.lua
 
 integrations\consoleport.lua
 integrations\pawn.lua
+integrations\masque.lua
 
 core\init.lua

BetterBags_Vanilla.toc

@@ -45,8 +45,6 @@ core\classic\constants.lua
 core\database.lua
 core\hooks.lua
 
-theme\masque.lua
-
 data\equipmentsets.lua
 data\items.lua
 data\categories.lua
@@ -92,6 +90,7 @@ config\customcat.lua
 
 integrations\consoleport.lua
 integrations\pawn.lua
+integrations\masque.lua
 
 core\init.lua
 core\classic\init.lua

BetterBags_Wrath.toc

@@ -44,8 +44,6 @@ core\classic\constants.lua
 core\database.lua
 core\hooks.lua
 
-theme\masque.lua
-
 data\equipmentsets.lua
 data\items.lua
 data\categories.lua
@@ -91,6 +89,7 @@ config\customcat.lua
 
 integrations\consoleport.lua
 integrations\pawn.lua
+integrations\masque.lua
 
 core\init.lua
 core\classic\init.lua

frames/bagbutton.lua

@@ -7,8 +7,8 @@ local addon = LibStub('AceAddon-3.0'):GetAddon(addonName)
 ---@class Constants: AceModule
 local const = addon:GetModule('Constants')
 
----@class MasqueTheme: AceModule
-local masque = addon:GetModule('Masque')
+---@class Events: AceModule
+local events = addon:GetModule('Events')
 
 ---@class Localization: AceModule
 local L = addon:GetModule('Localization')
@@ -84,10 +84,11 @@ function BagButtonFrame.bagButtonProto:SetBag(bag)
   SetItemButtonTexture(self.frame, icon)
   SetItemButtonQuality(self.frame, GetInventoryItemQuality("player", self.invID))
   SetItemButtonCount(self.frame, 1)
+  events:SendMessage('bagbutton/Updated', self)
 end
 
 function BagButtonFrame.bagButtonProto:ClearBag()
-  masque:RemoveButtonFromGroup(self.masqueGroup, self.frame)
+  events:SendMessage('bagbutton/Clearing', self)
   self.masqueGroup = nil
   self.invID = nil
   self.bag = nil
@@ -100,17 +101,6 @@ function BagButtonFrame.bagButtonProto:ClearBag()
   SetItemButtonQuality(self.frame, nil)
 end
 
----@param kind BagKind
-function BagButtonFrame.bagButtonProto:AddToMasqueGroup(kind)
-  if kind == const.BAG_KIND.BANK then
-    self.masqueGroup = "Bank"
-    masque:AddButtonToGroup(self.masqueGroup, self.frame)
-  else
-    self.masqueGroup = "Backpack"
-    masque:AddButtonToGroup(self.masqueGroup, self.frame)
-  end
-end
-
 function BagButtonFrame.bagButtonProto:OnEnter()
   if self.empty and self.kind == const.BAG_KIND.BANK and self.canBuy then
     GameTooltip:SetOwner(self.frame, "ANCHOR_LEFT")

frames/bagslots.lua

@@ -95,7 +95,6 @@ function BagSlots:CreatePanel(kind)
   for i, bag in pairs(bags) do
     local iframe = bagButton:Create()
     iframe:SetBag(bag)
-    iframe:AddToMasqueGroup(kind)
     b.content:AddCell(tostring(i), iframe)
   end
 

frames/classic/bagslots.lua

@@ -61,7 +61,6 @@ function BagSlots:CreatePanel(kind)
   for i, bag in pairs(bags) do
     local iframe = bagButton:Create()
     iframe:SetBag(bag)
-    iframe:AddToMasqueGroup(kind)
     b.content:AddCell(tostring(i), iframe)
   end
 

frames/classic/item.lua

@@ -7,9 +7,6 @@ local addon = LibStub('AceAddon-3.0'):GetAddon(addonName)
 ---@class Constants: AceModule
 local const = addon:GetModule('Constants')
 
----@class MasqueTheme: AceModule
-local masque = addon:GetModule('Masque')
-
 ---@class ItemFrame: AceModule
 local itemFrame = addon:GetModule('ItemFrame')
 
@@ -128,7 +125,6 @@ function itemFrame.itemProto:SetItem(data)
   self.button:CheckUpdateTooltip(tooltipOwner)
   self.button:SetMatchesSearch(not isFiltered)
 --]]
-  self:AddToMasqueGroup()
   self:SetAlpha(1)
   events:SendMessage('item/Updated', self)
   self.frame:Show()
@@ -175,7 +171,6 @@ function itemFrame.itemProto:SetFreeSlots(bagid, slotid, count, reagent)
     SetItemButtonQuality(self.button, Enum.ItemQuality.Artifact, nil, false, false)
   end
 
-  self:AddToMasqueGroup()
   self.button.IconBorder:SetBlendMode("BLEND")
   self.frame:SetAlpha(1)
   events:SendMessage('item/Updated', self)
@@ -186,7 +181,6 @@ end
 
 function itemFrame.itemProto:ClearItem()
   events:SendMessage('item/Clearing', self)
-  self:RemoveFromMasqueGroup()
   self.kind = nil
   self.frame:ClearAllPoints()
   self.frame:SetParent(nil)

frames/item.lua

@@ -7,9 +7,6 @@ local addon = LibStub('AceAddon-3.0'):GetAddon(addonName)
 ---@class Constants: AceModule
 local const = addon:GetModule('Constants')
 
----@class MasqueTheme: AceModule
-local masque = addon:GetModule('Masque')
-
 ---@class ItemFrame: AceModule
 local itemFrame = addon:NewModule('ItemFrame')
 
@@ -52,11 +49,12 @@ local debug = addon:GetModule('Debug')
 ---@field IconQuestTexture Texture
 ---@field NormalTexture Texture
 ---@field NewItemTexture Texture
----@field IconOverlay2 Texture
+---@field IconOverlay Texture
 ---@field ItemContextOverlay Texture
 ---@field Cooldown Cooldown
 ---@field UpdateTooltip function
 ---@field LockTexture Texture
+---@field IconQuestTexture Texture
 itemFrame.itemProto = {}
 
 local buttonCount = 0
@@ -69,7 +67,6 @@ local children = {
   "Cooldown",
   "NormalTexture",
   "NewItemTexture",
-  "IconOverlay2",
   "ItemContextOverlay",
   "UpgradeIcon"
 }
@@ -272,8 +269,6 @@ function itemFrame.itemProto:SetItem(data)
   self.button:CheckUpdateTooltip(tooltipOwner)
   self.button:SetMatchesSearch(not isFiltered)
 
-  self:AddToMasqueGroup()
-  self.button.IconBorder:SetBlendMode("BLEND")
   self:SetAlpha(1)
   events:SendMessage('item/Updated', self)
   self.frame:Show()
@@ -283,6 +278,11 @@ end
 function itemFrame.itemProto:SetSize(width, height)
   self.frame:SetSize(width, height)
   self.button:SetSize(width, height)
+  self.button.IconBorder:SetSize(width, height)
+  self.button.NormalTexture:SetSize(width, height)
+  self.IconQuestTexture:SetSize(width, height)
+  self.IconTexture:SetSize(width, height)
+  self.IconOverlay:SetSize(width, height)
 end
 
 -- SetFreeSlots will set the item button to a free slot.
@@ -327,9 +327,6 @@ function itemFrame.itemProto:SetFreeSlots(bagid, slotid, count, reagent)
     SetItemButtonQuality(self.button, Enum.ItemQuality.Common, nil, false, false)
   end
 
-  self:AddToMasqueGroup()
-  self.button.IconBorder:SetBlendMode("BLEND")
-
   self.isFreeSlot = true
   self.button.ItemSlotBackground:Show()
   self.frame:SetAlpha(1)
@@ -461,7 +458,6 @@ end
 
 function itemFrame.itemProto:ClearItem()
   events:SendMessage('item/Clearing', self)
-  self:RemoveFromMasqueGroup()
   self.kind = nil
   self.frame:ClearAllPoints()
   self.frame:SetParent(nil)
@@ -491,22 +487,6 @@ function itemFrame.itemProto:ClearItem()
   self.button.UpgradeIcon:SetShown(false)
 end
 
-function itemFrame.itemProto:AddToMasqueGroup()
-  if self.masqueGroup ~= nil then return end
-  if self.kind == const.BAG_KIND.BANK then
-    self.masqueGroup = "Bank"
-    masque:AddButtonToGroup(self.masqueGroup, self.button)
-  else
-    self.masqueGroup = "Backpack"
-    masque:AddButtonToGroup(self.masqueGroup, self.button)
-  end
-end
-
-function itemFrame.itemProto:RemoveFromMasqueGroup()
-  masque:RemoveButtonFromGroup(self.masqueGroup, self.button)
-  self.masqueGroup = nil
-end
-
 function itemFrame:OnInitialize()
   self._pool = CreateObjectPool(self._DoCreate, self._DoReset)
   self._pool:SetResetDisallowedIfNew()
@@ -549,6 +529,9 @@ function itemFrame:_DoCreate()
     i[child] = _G[name..child] ---@type texture
   end
 
+  -- Small fix for missing texture
+  i.IconOverlay = button['IconOverlay']
+
   p:SetSize(37, 37)
   button:SetSize(37, 37)
   button:RegisterForDrag("LeftButton")

frames/itemrow.lua

@@ -7,9 +7,6 @@ local addon = LibStub('AceAddon-3.0'):GetAddon(addonName)
 ---@class Constants: AceModule
 local const = addon:GetModule('Constants')
 
----@class MasqueTheme: AceModule
-local masque = addon:GetModule('Masque')
-
 ---@class Events: AceModule
 local events = addon:GetModule('Events')
 
@@ -126,11 +123,6 @@ function item.itemRowProto:IsNewItem()
   return self.button:IsNewItem()
 end
 
-function item.itemRowProto:AddToMasqueGroup()
-  --TODO(lobato): Style the individual row frame, maybe?
-  self.button:AddToMasqueGroup()
-end
-
 ---@return string
 function item.itemRowProto:GetGUID()
   return self.data.itemInfo.itemGUID

integrations/masque.lua

@@ -0,0 +1,68 @@
+local addonName = ... ---@type string
+
+---@class BetterBags: AceAddon
+local addon = LibStub('AceAddon-3.0'):GetAddon(addonName)
+
+---@class Events: AceModule
+local events = addon:GetModule('Events')
+
+---@class MasqueTheme: AceModule
+---@field groups table<string, MasqueGroup>
+local masque = addon:NewModule('Masque')
+
+---@class Masque: AceAddon
+local Masque = LibStub('Masque', true)
+
+---@private
+function masque:AddButtonToGroup(group, button)
+  if not Masque then
+    return
+  end
+  self.groups[group]:AddButton(button)
+end
+
+---@private
+function masque:RemoveButtonFromGroup(group, button)
+  if not Masque then
+    return
+  end
+  if group == nil then
+    return
+  end
+  self.groups[group]:RemoveButton(button)
+end
+
+function masque:OnEnable()
+  if not Masque then return end
+  self.groups = {}
+  self.groups["Backpack"] = Masque:Group('BetterBags', 'Backpack')
+  self.groups["Bank"] = Masque:Group('BetterBags', 'Bank')
+
+  events:RegisterMessage('item/Updated', function(_, item)
+    ---@cast item Item
+    local group = item.kind == 'Bank' and self.groups["Bank"] or self.groups["Backpack"]
+    group:AddButton(item.button)
+    item.button.IconBorder:SetBlendMode("BLEND")
+  end)
+
+  events:RegisterMessage('item/Clearing', function(_, item)
+    ---@cast item Item
+    local group = item.kind == 'Bank' and self.groups["Bank"] or self.groups["Backpack"]
+    group:RemoveButton(item.button)
+  end)
+
+  events:RegisterMessage('bagbutton/Updated', function(_, bag)
+    ---@cast bag BagButton
+    local group = bag.kind == 'Bank' and self.groups["Bank"] or self.groups["Backpack"]
+    group:AddButton(bag.frame)
+    bag.frame.IconBorder:SetBlendMode("BLEND")
+  end)
+
+  events:RegisterMessage('bagbutton/Clearing', function(_, bag)
+    ---@cast bag BagButton
+    local group = bag.kind == 'Bank' and self.groups["Bank"] or self.groups["Backpack"]
+    group:RemoveButton(bag.frame)
+  end)
+
+  print("BetterBags: Masque integration enabled.")
+end