Consolidate EditBox skin

Haleth · Aug 24, 2019 · e767ee0 · e767ee0
1 parent c6f1a90
commit e767ee0
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 28 deletions.
diff --git a/Skin/AddOns/Blizzard_Communities.lua b/Skin/AddOns/Blizzard_Communities.lua
@@ -166,15 +166,14 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
             Skin.InsetFrameTemplate(Frame.InsetFrame)
         end
         function Skin.CommunitiesChatEditBoxTemplate(EditBox)
+            Skin.FrameTypeEditBox(EditBox)
+            local bg = EditBox:GetBackdropTexture("bg")
+            bg:SetPoint("TOPLEFT", -5, -5)
+            bg:SetPoint("BOTTOMRIGHT", 5, 5)
+
             EditBox.Left:Hide()
             EditBox.Right:Hide()
             EditBox.Mid:Hide()
-
-            local bd = _G.CreateFrame("Frame", nil, EditBox)
-            bd:SetPoint("TOPLEFT", -5, -5)
-            bd:SetPoint("BOTTOMRIGHT", 5, 5)
-            bd:SetFrameLevel(EditBox:GetFrameLevel())
-            Base.SetBackdrop(bd, Color.frame, 0.5)
         end
     end
     do --[[ CommunitiesInvitationFrame ]]

diff --git a/Skin/FrameXML/ChatFrame.lua b/Skin/FrameXML/ChatFrame.lua
@@ -5,7 +5,6 @@ local _, private = ...
 
 --[[ Core ]]
 local Aurora = private.Aurora
-local Base = Aurora.Base
 local Hook, Skin = Aurora.Hook, Aurora.Skin
 local Color = Aurora.Color
 
@@ -31,9 +30,9 @@ end
 
 do --[[ FrameXML\ChatFrame.xml ]]
     function Skin.ChatFrameEditBoxTemplate(EditBox)
-        local name = EditBox:GetName()
-        Base.SetBackdrop(EditBox, Color.frame, 0.3)
+        Skin.FrameTypeEditBox(EditBox)
 
+        local name = EditBox:GetName()
         _G[name.."Left"]:Hide()
         _G[name.."Right"]:Hide()
         _G[name.."Mid"]:Hide()

diff --git a/Skin/FrameXML/FriendsFrame.lua b/Skin/FrameXML/FriendsFrame.lua
@@ -129,8 +129,7 @@ function private.FrameXML.FriendsFrame()
 
             bg = EditBox.MiddleBorder
         })
-        Base.SetBackdrop(EditBox, Color.frame)
-        EditBox:SetBackdropBorderColor(Color.button)
+        Skin.FrameTypeEditBox(EditBox)
 
         local bg = EditBox:GetBackdropTexture("bg")
         bg:ClearAllPoints()
@@ -260,11 +259,10 @@ function private.FrameXML.FriendsFrame()
 
     Skin.UIPanelInfoButton(_G.AddFriendEntryFrameInfoButton)
     do -- AddFriendNameEditBox
+        Skin.FrameTypeEditBox(_G.AddFriendNameEditBox)
         _G.AddFriendNameEditBoxLeft:Hide()
         _G.AddFriendNameEditBoxRight:Hide()
         _G.AddFriendNameEditBoxMiddle:Hide()
-        Base.SetBackdrop(_G.AddFriendNameEditBox, Color.frame)
-        _G.AddFriendNameEditBox:SetBackdropBorderColor(Color.button)
     end
     Skin.UIPanelButtonTemplate(_G.AddFriendEntryFrameAcceptButton)
     Skin.UIPanelButtonTemplate(_G.AddFriendEntryFrameCancelButton)

diff --git a/Skin/FrameXML/MailFrame.lua b/Skin/FrameXML/MailFrame.lua
@@ -178,18 +178,17 @@ do --[[ FrameXML\MailFrame.xml ]]
 
     --[[ Fake template ]]--
     function Skin.SendMailInputBox(EditBox)
+        Skin.FrameTypeEditBox(EditBox)
         EditBox:SetHeight(22)
 
         local name = EditBox:GetName()
         _G[name.."Left"]:Hide()
         _G[name.."Middle"]:Hide()
         _G[name.."Right"]:Hide()
 
-        local bg = _G.CreateFrame("Frame", nil, EditBox)
+        local bg = EditBox:GetBackdropTexture("bg")
         bg:SetPoint("TOPLEFT", -8, -1)
         bg:SetPoint("BOTTOMRIGHT", 8, 1)
-        bg:SetFrameLevel(EditBox:GetFrameLevel())
-        Base.SetBackdrop(bg, Color.frame)
     end
 end
 

diff --git a/Skin/FrameXML/StaticPopupSpecial.lua b/Skin/FrameXML/StaticPopupSpecial.lua
@@ -7,7 +7,6 @@ local _, private = ...
 local Aurora = private.Aurora
 local Base = Aurora.Base
 local Skin = Aurora.Skin
-local Color = Aurora.Color
 
 --do --[[ FrameXML\StaticPopupSpecial.lua ]]
 --end
@@ -31,8 +30,7 @@ do --[[ FrameXML\StaticPopupSpecial.xml ]]
 
             bg = EditBox.Middle
         })
-        Base.SetBackdrop(EditBox, Color.frame)
-        EditBox:SetBackdropBorderColor(Color.button)
+        Skin.FrameTypeEditBox(EditBox)
 
         local scrollframe = EditBox.ScrollFrame
         Skin.UIPanelScrollFrameTemplate(scrollframe)

diff --git a/Skin/FrameXML/WardrobeOutfits.lua b/Skin/FrameXML/WardrobeOutfits.lua
@@ -58,12 +58,12 @@ function private.FrameXML.WardrobeOutfits()
     Skin.DialogBorderTemplate(WardrobeOutfitEditFrame.Border)
 
     local EditBox = WardrobeOutfitEditFrame.EditBox
+    Skin.FrameTypeEditBox(EditBox)
+
     EditBox.LeftTexture:Hide()
     EditBox.RightTexture:Hide()
     EditBox.MiddleTexture:Hide()
 
-    Base.SetBackdrop(EditBox, Color.frame)
-    EditBox:SetBackdropBorderColor(Color.button)
     local bg = EditBox:GetBackdropTexture("bg")
     bg:SetPoint("TOPLEFT", -5, -3)
     bg:SetPoint("BOTTOMRIGHT", 5, 3)

diff --git a/Skin/SharedXML/SecureUIPanelTemplates.lua b/Skin/SharedXML/SecureUIPanelTemplates.lua
@@ -14,13 +14,12 @@ local Color = Aurora.Color
 
 do --[[ FrameXML\SecureUIPanelTemplates.xml ]]
     function Skin.InputBoxTemplate(EditBox)
+        Skin.FrameTypeEditBox(EditBox)
+
         EditBox.Left:Hide()
         EditBox.Right:Hide()
         EditBox.Middle:Hide()
 
-        Base.SetBackdrop(EditBox, Color.frame)
-        EditBox:SetBackdropBorderColor(Color.button)
-
         local bg = EditBox:GetBackdropTexture("bg")
         bg:ClearAllPoints()
         bg:SetHeight(20)

diff --git a/Skin/SharedXML/SharedUIPanelTemplates.lua b/Skin/SharedXML/SharedUIPanelTemplates.lua
@@ -204,6 +204,12 @@ do -- Basic frame type skins
             end
         end
     end
+    do -- EditBox
+        function Skin.FrameTypeEditBox(Frame)
+            Base.SetBackdrop(Frame, Color.frame)
+            Frame:SetBackdropBorderColor(Color.button)
+        end
+    end
 end
 
 do --[[ SharedXML\SharedUIPanelTemplates.lua ]]

diff --git a/aurora.lua b/aurora.lua
@@ -135,7 +135,8 @@ function private.OnLoad()
     end
 
     -- Create API hooks
-    local Base, Hook = Aurora.Base, Aurora.Hook
+    local Base = Aurora.Base
+    local Hook, Skin = Aurora.Hook, Aurora.Skin
     function Hook.GameTooltip_SetBackdropStyle(self, style)
         if not self.IsEmbedded then
             Base.SetBackdrop(self, Color.frame, AuroraConfig.alpha)
@@ -187,6 +188,8 @@ function private.OnLoad()
             EditBox:SetPoint("TOPLEFT", 57, -28)
         else
             EditBox = _G.FriendsFrameBroadcastInput
+            Skin.FrameTypeEditBox(EditBox)
+
             EditBox:ClearAllPoints()
             EditBox:SetSize(245, 29)
             EditBox:SetPoint("TOPLEFT", 54, -26)
@@ -197,9 +200,6 @@ function private.OnLoad()
             _G.FriendsFrameBroadcastInputFill:SetPoint("LEFT", 20, 0)
             EditBox.icon:SetPoint("LEFT", 3, 0)
 
-            Base.SetBackdrop(EditBox, Color.frame)
-            EditBox:SetBackdropBorderColor(Color.button)
-
             local stop
             _G.hooksecurefunc(EditBox, "SetTextInsets", function(self, left, right, top, bottom)
                 if stop then return end