Added better handling of 'esc' button.

Blizzard Bag button now toggles the player bag.

.vscode/settings.json

@@ -81,7 +81,9 @@
     "BANK",
     "COSTS_LABEL",
     "BANK_BAG",
-    "show"
+    "show",
+    "MainMenuBar",
+    "MainMenuBarBackpackButton"
   ],
   "Notes.notesLocation": ".notes",
   "Lua.diagnostics.ignoredFiles": "Disable",

annotations.lua

@@ -70,6 +70,9 @@ BankFrame = {}
 ---@class BagsBar: Frame
 BagsBar = {}
 
+---@class MainMenuBarBackpackButton: Button
+MainMenuBarBackpackButton = {}
+
 ---@class DLAPI
 DLAPI = {}
 

core/hooks.lua

@@ -2,6 +2,7 @@ local addonName = ... ---@type string
 
 ---@class BetterBags: AceAddon
 local addon = LibStub('AceAddon-3.0'):GetAddon(addonName)
+---@cast addon +AceHook-3.0
 
 function addon:OpenAllBags()
   addon.Bags.Backpack:Show()
@@ -11,10 +12,29 @@ function addon:CloseAllBags()
   addon.Bags.Backpack:Hide()
 end
 
+function addon:CloseBackpack()
+  addon.Bags.Backpack:Hide()
+end
+
+function addon:OpenBackpack()
+  addon.Bags.Backpack:Show()
+end
+
 function addon:ToggleAllBags()
   addon.Bags.Backpack:Toggle()
 end
 
+function addon:ToggleBackpack(rf)
+  addon.Bags.Backpack:Show()
+end
+
+function addon:CloseSpecialWindows()
+  addon.Bags.Backpack:Hide()
+  addon.Bags.Bank:Hide()
+  addon.Bags.Bank:SwitchToBank()
+  CloseBankFrame()
+end
+
 function addon:OpenBank()
   addon.Bags.Bank:Show()
   addon.Bags.Backpack:Show()
@@ -24,4 +44,4 @@ function addon:CloseBank()
   addon.Bags.Bank:Hide()
   addon.Bags.Backpack:Hide()
   addon.Bags.Bank:SwitchToBank()
-end
+end

core/init.lua

@@ -59,6 +59,10 @@ function addon:HideBlizzardBags()
     _G["ContainerFrame"..i]:SetParent(sneakyFrame)
   end
 
+  MainMenuBarBackpackButton:SetScript("OnClick", function()
+    self:ToggleAllBags()
+  end)
+
   if not database:GetShowBagButton() then
     BagsBar:Hide()
   end
@@ -80,10 +84,15 @@ function addon:OnEnable()
   addon.Bags.Backpack = BagFrame:Create(const.BAG_KIND.BACKPACK)
   addon.Bags.Bank = BagFrame:Create(const.BAG_KIND.BANK)
 
+  --[[
+  self:SecureHook('OpenAllBags')
+  self:SecureHook('OpenBackpack')
+  self:SecureHook('ToggleBackpack')
+  self:SecureHook('CloseBackpack')
   self:SecureHook('CloseAllBags')
-
-  self:SecureHook('OpenAllBags', self.OpenAllBags)
-  self:SecureHook('ToggleAllBags', self.ToggleAllBags)
+  --]]
+  self:SecureHook('CloseSpecialWindows')
+  self:SecureHook('ToggleAllBags')
 
   events:RegisterEvent('BANKFRAME_CLOSED', self.CloseBank)