Even More Fixes (#458)

* Searching in Cata now works again!

* Fixed the ElvUI search overlay in non-retail setups.

* Fixed a bug where search would not clear sometimes when closing the bags.

* Re-centered search on the default theme.

* In-bag search is enabled by default.

Author: Cidan

annotations.lua

@@ -24,6 +24,7 @@
 ---@field IconTexture Texture
 ---@field ItemSlotBackground Texture
 ---@field backdrop Frame
+---@field searchOverlay Texture
 local itemButton = {}
 
 ---@param bagid number

core/constants.lua

@@ -354,7 +354,7 @@ const.DATABASE_DEFAULTS = {
     enabled = true,
     showBagButton = true,
     debug = false,
-    inBagSearch = false,
+    inBagSearch = true,
     showKeybindWarning = true,
     theme = 'Default',
     showFullSectionNames = {

frames/bag.lua

@@ -113,6 +113,7 @@ local windowGroup = addon:GetModule('WindowGroup')
 ---@field windowGrouping WindowGrouping
 ---@field sideAnchor Frame
 ---@field previousSize number
+---@field searchFrame SearchFrame
 bagFrame.bagProto = {}
 
 function bagFrame.bagProto:Show()
@@ -133,6 +134,8 @@ function bagFrame.bagProto:Hide()
   self.frame:Hide()
   if self.kind == const.BAG_KIND.BANK then
     CloseBankFrame()
+  elseif self.kind == const.BAG_KIND.BACKPACK then
+    self.searchFrame:Hide()
   end
   if self.drawOnClose and self.kind == const.BAG_KIND.BACKPACK then
     debug:Log("draw", "Drawing bag on close")
@@ -426,7 +429,8 @@ function bagFrame:Create(kind)
   b.slots = slots
 
   if kind == const.BAG_KIND.BACKPACK then
-    search:Create(b.frame)
+    print("search frame made")
+    b.searchFrame = search:Create(b.frame)
   end
 
   if kind == const.BAG_KIND.BACKPACK then

frames/classic/bag.lua

@@ -166,7 +166,7 @@ function bagFrame:Create(kind)
   b.slots = slots
 
   if kind == const.BAG_KIND.BACKPACK then
-    search:Create(b.frame)
+    b.searchFrame = search:Create(b.frame)
   end
 
   if kind == const.BAG_KIND.BACKPACK then

frames/era/bag.lua

@@ -265,7 +265,7 @@ function bagFrame:Create(kind)
   b.slots = slots
 
   if kind == const.BAG_KIND.BACKPACK then
-    search:Create(b.frame)
+    b.searchFrame = search:Create(b.frame)
   end
 
   if kind == const.BAG_KIND.BACKPACK then

frames/search.lua

@@ -45,6 +45,7 @@ end
 
 function search.searchProto:Hide()
   if self.frame:IsShown() then
+    self.textBox:SetText("")
     self.textBox:ClearFocus()
     if self.fadeOutGroup then
       self.fadeOutGroup:Play()

frames/sectionconfig.lua

@@ -116,8 +116,8 @@ function sectionConfigFrame:initSectionItem(button, elementData)
     button.Expand:SetNormalTexture("Interface\\glues\\common\\glue-leftarrow-button-up")
     button.Expand:SetPushedTexture("Interface\\glues\\common\\glue-leftarrow-button-down")
     button.Expand:SetHighlightTexture("Interface\\glues\\common\\glue-leftarrow-button-highlight", "ADD")
-    button.Visible:SetNormalTexture("Interface\\Addons\\BetterBags\\textures\\visible.png")
-    button.Visible:SetHighlightTexture("Interface\\Addons\\BetterBags\\textures\\visible.png")
+    button.Visible:SetNormalTexture("Interface\\AddOns\\BetterBags\\textures\\visible.blp")
+    button.Visible:SetHighlightTexture("Interface\\Addons\\BetterBags\\textures\\visible.blp")
     button.Visible:SetScript("OnEnter", function()
       GameTooltip:SetOwner(button, "ANCHOR_LEFT")
       GameTooltip:AddLine("Show or hide this category in the bags.", 1, .81960791349411, 0, true)

textures/visible.blp

@@ -44,7 +44,7 @@ local defaultTheme = {
       end)
 
       local searchBox = search:CreateBox(frame.Owner.kind, decoration --[[@as Frame]])
-      searchBox.frame:SetPoint("TOPRIGHT", decoration, "TOPRIGHT", -22, -2)
+      searchBox.frame:SetPoint("TOP", decoration, "TOP", 0, -2)
       searchBox.frame:SetSize(150, 20)
       decoration.search = searchBox
 
@@ -117,6 +117,11 @@ local defaultTheme = {
     local decoration = decoratorFrames[frame:GetName()]
     if decoration then
       decoration.search:SetShown(shown)
+      if shown then
+        decoration.TitleContainer:Hide()
+      else
+        decoration.TitleContainer:Show()
+      end
     end
   end
 }

themes/default.lua

@@ -165,6 +165,11 @@ local theme = {
     S:HandleItemButton(button, true)
     S:HandleIconBorder(button.IconBorder)
     button:Show()
+    if not addon.isRetail then
+      button.searchOverlay = button:CreateTexture(nil, "ARTWORK")
+      button.searchOverlay:SetColorTexture(0, 0, 0, 0.8)
+      button.searchOverlay:SetAllPoints()
+    end
 
     button:GetNormalTexture():SetAlpha(0)
     button:SetHighlightTexture(E.Media.Textures.White8x8)
@@ -192,7 +197,6 @@ local theme = {
       end
       button.IconQuestTexture.Hide = function()
         quest_overlay:Hide()
-        --button.IconBorder:SetVertexColor(1, 1, 1, 1)
       end
     end
     if button.Cooldown then

themes/elvui.lua

@@ -269,12 +269,10 @@ end
 function themes.CreateBlankItemButtonDecoration(parent, theme, buttonName)
   ---@type ItemButton
   local button
-  if not addon.isClassic then
+  if addon.isRetail then
     button = CreateFrame("ItemButton", buttonName.."Decoration"..theme, parent, "ContainerFrameItemButtonTemplate") --[[@as ItemButton]]
-    button:SetAllPoints()
   else
     button = CreateFrame("Button", buttonName.."Decoration"..theme, parent, "ContainerFrameItemButtonTemplate") --[[@as ItemButton]]
-    button:SetAllPoints()
     ---@diagnostic disable-next-line: duplicate-set-field
     button.SetMatchesSearch = function(me, match)
       if match then
@@ -284,6 +282,7 @@ function themes.CreateBlankItemButtonDecoration(parent, theme, buttonName)
       end
     end
   end
+  button:SetAllPoints()
 
   if addon.isRetail then
     button.ItemSlotBackground = button:CreateTexture(nil, "BACKGROUND", "ItemSlotBackgroundCombinedBagsTemplate", -6)