Fix errors with 10.1.5 ptr

Gethe · Jul 6, 2023 · fbb81a4 · fbb81a4
1 parent 41d6696
commit fbb81a4
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 111 deletions.
diff --git a/Skin/Retail/Interface/FrameXML/FrameXML.xml b/Skin/Retail/Interface/FrameXML/FrameXML.xml
@@ -329,7 +329,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <Script file="ReputationFrame.lua"/>
     <!--Script file="FriendshipStatusBar.lua"/-->
     <Script file="QuestFrame.lua"/>
-    <Script file="QuestPOI.lua"/>
+    <!--Script file="QuestPOI.lua"/-->
     <Script file="QuestInfo.lua"/>
     <Script file="MerchantFrame.lua"/>
     <Script file="TradeFrame.lua"/>

diff --git a/Skin/Retail/Interface/FrameXML/LFGFrame.lua b/Skin/Retail/Interface/FrameXML/LFGFrame.lua
@@ -97,7 +97,9 @@ end
 
 do --[[ FrameXML\LFGFrame.xml ]]
     function Skin.LFGRoleButtonTemplate(Button)
-        Button.cover:SetColorTexture(0, 0, 0, 0.75)
+        if not private.isPatch then
+            Button.cover:SetColorTexture(0, 0, 0, 0.75)
+        end
         Base.SetTexture(Button:GetNormalTexture(), "icon"..(Button.role or "GUIDE"))
         Skin.UICheckButtonTemplate(Button.checkButton)
         Button.checkButton:SetPoint("BOTTOMLEFT", -4, -4)
@@ -181,11 +183,13 @@ function private.FrameXML.LFGFrame()
     LFGDungeonReadyDialog.background:SetPoint("TOPLEFT", 6, -6)
     LFGDungeonReadyDialog.background:SetPoint("BOTTOMRIGHT", -6, 64)
 
-    LFGDungeonReadyDialog.filigree:Hide()
+    if not private.isPatch then
+        LFGDungeonReadyDialog.filigree:Hide()
+    end
     LFGDungeonReadyDialog.bottomArt:Hide()
 
-    Skin.DialogBorderTemplate(LFGDungeonReadyDialog.Border)
-    Skin.MinimizeButton(_G.LFGDungeonReadyDialogCloseButton)
+    Skin.DialogBorderTranslucentTemplate(LFGDungeonReadyDialog.Border)
+    Skin.UIPanelHideButtonNoScripts(_G.LFGDungeonReadyDialogCloseButton)
     Skin.UIPanelButtonTemplate(LFGDungeonReadyDialog.enterButton)
     Skin.UIPanelButtonTemplate(LFGDungeonReadyDialog.leaveButton)
 

diff --git a/Skin/Retail/Interface/FrameXML/LFGList.lua b/Skin/Retail/Interface/FrameXML/LFGList.lua
@@ -180,7 +180,9 @@ do --[[ FrameXML\LFGList.xml ]]
         Skin.UIMenuButtonStretchTemplate(Button.InviteButton)
     end
     function Skin.LFGListRoleButtonTemplate(Button)
-        Button.cover:SetColorTexture(0, 0, 0, 0.75)
+        if not private.isPatch then
+            Button.cover:SetColorTexture(0, 0, 0, 0.75)
+        end
         Base.SetTexture(Button:GetNormalTexture(), "icon"..Button.role)
         Skin.UICheckButtonTemplate(Button.CheckButton)
     end

diff --git a/Skin/Retail/Interface/FrameXML/MerchantFrame.lua b/Skin/Retail/Interface/FrameXML/MerchantFrame.lua
@@ -50,25 +50,41 @@ function private.FrameXML.MerchantFrame()
     _G.BuybackBG:SetPoint("BOTTOMRIGHT")
 
     _G.MerchantFrameBottomLeftBorder:SetAlpha(0)
-    _G.MerchantFrameBottomRightBorder:SetAlpha(0)
+    if not private.isPatch then
+        _G.MerchantFrameBottomRightBorder:SetAlpha(0)
+    end
 
     for i = 1, _G.BUYBACK_ITEMS_PER_PAGE do
         Skin.MerchantItemTemplate(_G["MerchantItem"..i])
     end
 
-    _G.MerchantRepairAllButton:ClearPushedTexture()
-    _G.MerchantRepairAllIcon:SetTexture([[Interface\Icons\Trade_BlackSmithing]])
-    Base.CropIcon(_G.MerchantRepairAllIcon, _G.MerchantRepairAllButton)
+    if private.isPatch then
+        _G.MerchantSellAllJunkButton:ClearPushedTexture()
+        Base.CropIcon(_G.MerchantSellAllJunkButton.Icon, _G.MerchantSellAllJunkButton)
+
+        _G.MerchantRepairAllButton:ClearPushedTexture()
+        Base.CropIcon(_G.MerchantRepairAllButton.Icon, _G.MerchantRepairAllButton)
+
+        _G.MerchantRepairItemButton:ClearPushedTexture()
+        Base.CropIcon(_G.MerchantRepairItemButton.Icon, _G.MerchantRepairItemButton)
 
-    local repairItem = _G.MerchantRepairItemButton:GetRegions()
-    _G.MerchantRepairItemButton:ClearPushedTexture()
-    repairItem:SetTexture([[Interface\Icons\INV_Hammer_20]])
-    Base.CropIcon(repairItem, _G.MerchantRepairItemButton)
+        _G.MerchantGuildBankRepairButton:ClearPushedTexture()
+        Base.CropIcon(_G.MerchantGuildBankRepairButton.Icon, _G.MerchantGuildBankRepairButton)
+    else
+        _G.MerchantRepairAllButton:ClearPushedTexture()
+        _G.MerchantRepairAllIcon:SetTexture([[Interface\Icons\Trade_BlackSmithing]])
+        Base.CropIcon(_G.MerchantRepairAllIcon, _G.MerchantRepairAllButton)
 
-    _G.MerchantGuildBankRepairButton:ClearPushedTexture()
-    _G.MerchantGuildBankRepairButtonIcon:SetTexture([[Interface\Icons\Trade_BlackSmithing]])
-    _G.MerchantGuildBankRepairButtonIcon:SetVertexColor(0.9, 0.8, 0)
-    Base.CropIcon(_G.MerchantGuildBankRepairButtonIcon, _G.MerchantGuildBankRepairButton)
+        local repairItem = _G.MerchantRepairItemButton:GetRegions()
+        _G.MerchantRepairItemButton:ClearPushedTexture()
+        repairItem:SetTexture([[Interface\Icons\INV_Hammer_20]])
+        Base.CropIcon(repairItem, _G.MerchantRepairItemButton)
+
+        _G.MerchantGuildBankRepairButton:ClearPushedTexture()
+        _G.MerchantGuildBankRepairButtonIcon:SetTexture([[Interface\Icons\Trade_BlackSmithing]])
+        _G.MerchantGuildBankRepairButtonIcon:SetVertexColor(0.9, 0.8, 0)
+        Base.CropIcon(_G.MerchantGuildBankRepairButtonIcon, _G.MerchantGuildBankRepairButton)
+    end
 
     do
         local name = _G.MerchantBuyBackItem:GetName()

diff --git a/Skin/Retail/Interface/FrameXML/MirrorTimer.lua b/Skin/Retail/Interface/FrameXML/MirrorTimer.lua
@@ -19,7 +19,13 @@ do --[[ FrameXML\MirrorTimer.xml ]]
 end
 
 function private.FrameXML.MirrorTimer()
-    Skin.MirrorTimerTemplate(_G.MirrorTimer1)
-    Skin.MirrorTimerTemplate(_G.MirrorTimer2)
-    Skin.MirrorTimerTemplate(_G.MirrorTimer3)
+    if private.isPatch then
+        Skin.MirrorTimerTemplate(_G.MirrorTimerContainer.mirrorTimers[1])
+        Skin.MirrorTimerTemplate(_G.MirrorTimerContainer.mirrorTimers[2])
+        Skin.MirrorTimerTemplate(_G.MirrorTimerContainer.mirrorTimers[3])
+    else
+        Skin.MirrorTimerTemplate(_G.MirrorTimer1)
+        Skin.MirrorTimerTemplate(_G.MirrorTimer2)
+        Skin.MirrorTimerTemplate(_G.MirrorTimer3)
+    end
 end
diff --git a/Skin/Retail/Interface/FrameXML/PVPHelper.lua b/Skin/Retail/Interface/FrameXML/PVPHelper.lua
@@ -27,18 +27,20 @@ function private.FrameXML.PVPHelper()
 
     --[[ PVPReadyDialog ]]--
     local PVPReadyDialog = _G.PVPReadyDialog
-    Skin.DialogBorderTemplate(PVPReadyDialog.Border)
+    Skin.DialogBorderTranslucentTemplate(PVPReadyDialog.Border)
     local bg = PVPReadyDialog.Border:GetBackdropTexture("bg")
 
     PVPReadyDialog.background:SetAlpha(0.75)
     PVPReadyDialog.background:ClearAllPoints()
     PVPReadyDialog.background:SetPoint("TOPLEFT", bg, 1, -1)
     PVPReadyDialog.background:SetPoint("BOTTOMRIGHT", bg, -1, 68)
 
-    PVPReadyDialog.filigree:Hide()
+    if not private.isPatch then
+        PVPReadyDialog.filigree:Hide()
+    end
     PVPReadyDialog.bottomArt:Hide()
 
-    Skin.MinimizeButton(_G.PVPReadyDialogCloseButton)
+    Skin.UIPanelHideButtonNoScripts(_G.PVPReadyDialogCloseButton)
     Skin.UIPanelButtonTemplate(PVPReadyDialog.enterButton)
     Skin.UIPanelButtonTemplate(PVPReadyDialog.leaveButton)
 

diff --git a/Skin/Retail/Interface/FrameXML/QuestPOI.lua b/Skin/Retail/Interface/FrameXML/QuestPOI.lua
diff --git a/Skin/Retail/Interface/FrameXML/RolePoll.lua b/Skin/Retail/Interface/FrameXML/RolePoll.lua
@@ -6,48 +6,29 @@ if private.shouldSkip() then return end
 
 --[[ Core ]]
 local Aurora = private.Aurora
-local Skin = Aurora.Skin
-local F, C = _G.unpack(Aurora)
+local Base = Aurora.Base
+local Hook, Skin = Aurora.Hook, Aurora.Skin
+local Color, Util = Aurora.Color, Aurora.Util
+
+--do --[[ FrameXML\RolePoll.lua ]]
+--end
+
+do --[[ FrameXML\RolePoll.xml ]]
+    function Skin.RolePollRoleButtonTemplate(Button)
+        if not private.isPatch then
+            Button.cover:SetColorTexture(0, 0, 0, 0.75)
+        end
+        Base.SetTexture(Button:GetNormalTexture(), "icon"..(Button.role or "GUIDE"))
+        Skin.UICheckButtonTemplate(Button.checkButton)
+        Button.checkButton:SetPoint("BOTTOMLEFT", -4, -4)
+    end
+end
 
 function private.FrameXML.RolePoll()
     Skin.DialogBorderTemplate(_G.RolePollPopup.Border)
-    F.Reskin(_G.RolePollPopupAcceptButton)
-    F.ReskinClose(_G.RolePollPopupCloseButton)
-
-    for _, roleButton in pairs({_G.RolePollPopupRoleButtonTank, _G.RolePollPopupRoleButtonHealer, _G.RolePollPopupRoleButtonDPS}) do
-        roleButton.cover:SetTexture(C.media.roleIcons)
-        roleButton:SetNormalTexture(C.media.roleIcons)
-
-        roleButton.checkButton:SetFrameLevel(roleButton:GetFrameLevel() + 2)
-
-        local left = roleButton:CreateTexture(nil, "OVERLAY")
-        left:SetWidth(1)
-        left:SetTexture(C.media.backdrop)
-        left:SetVertexColor(0, 0, 0)
-        left:SetPoint("TOPLEFT", 9, -7)
-        left:SetPoint("BOTTOMLEFT", 9, 11)
-
-        local right = roleButton:CreateTexture(nil, "OVERLAY")
-        right:SetWidth(1)
-        right:SetTexture(C.media.backdrop)
-        right:SetVertexColor(0, 0, 0)
-        right:SetPoint("TOPRIGHT", -9, -7)
-        right:SetPoint("BOTTOMRIGHT", -9, 11)
-
-        local top = roleButton:CreateTexture(nil, "OVERLAY")
-        top:SetHeight(1)
-        top:SetTexture(C.media.backdrop)
-        top:SetVertexColor(0, 0, 0)
-        top:SetPoint("TOPLEFT", 9, -7)
-        top:SetPoint("TOPRIGHT", -9, -7)
-
-        local bottom = roleButton:CreateTexture(nil, "OVERLAY")
-        bottom:SetHeight(1)
-        bottom:SetTexture(C.media.backdrop)
-        bottom:SetVertexColor(0, 0, 0)
-        bottom:SetPoint("BOTTOMLEFT", 9, 11)
-        bottom:SetPoint("BOTTOMRIGHT", -9, 11)
-
-        F.ReskinRadio(roleButton.checkButton)
-    end
+    Skin.UIPanelCloseButton(_G.RolePollPopupCloseButton)
+    Skin.LFGRoleButtonTemplate(_G.RolePollPopupRoleButtonTank)
+    Skin.LFGRoleButtonTemplate(_G.RolePollPopupRoleButtonHealer)
+    Skin.LFGRoleButtonTemplate(_G.RolePollPopupRoleButtonDPS)
+    Skin.UIPanelButtonTemplate(_G.RolePollPopupAcceptButton)
 end
diff --git a/Skin/Retail/Interface/SharedXML/SharedUIPanelTemplates.lua b/Skin/Retail/Interface/SharedXML/SharedUIPanelTemplates.lua
@@ -228,6 +228,22 @@ do --[[ SharedXML\SharedUIPanelTemplates.lua ]]
 end
 
 do --[[ SharedXML\SharedUIPanelTemplates.xml ]]
+    function Skin.UIPanelHideButtonNoScripts(Button)
+        Skin.FrameTypeButton(Button)
+        Button:SetBackdropOption("offsets", {
+            left = 4,
+            right = 11,
+            top = 10,
+            bottom = 5,
+        })
+
+        local bg = Button:GetBackdropTexture("bg")
+        local hline = Button:CreateTexture()
+        hline:SetColorTexture(1, 1, 1)
+        hline:SetSize(11, 1)
+        hline:SetPoint("BOTTOMLEFT", bg, 3, 3)
+        Button._auroraTextures = {hline}
+    end
     function Skin.UIPanelCloseButton(Button)
         Skin.FrameTypeButton(Button)
         Button:SetBackdropOption("offsets", {
@@ -315,7 +331,9 @@ do --[[ SharedXML\SharedUIPanelTemplates.xml ]]
         check:SetVertexColor(Color.highlight:GetRGB())
 
         local disabled = CheckButton:GetDisabledCheckedTexture()
-        disabled:SetAllPoints(check)
+        if disabled then
+            disabled:SetAllPoints(check)
+        end
     end
 
     function Skin.GlowBoxArrowTemplate(Frame, direction)

diff --git a/Skin/init.lua b/Skin/init.lua
@@ -11,7 +11,7 @@ private.isBCC = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_BURNING_CRUSADE_CLASSIC
 private.isWrath = _G.WOW_PROJECT_ID == (_G.WOW_PROJECT_WRATH_CLASSIC or 11)
 
 --private.hasAPI = (not private.isRetail) and _G.InClickBindingMode
-private.isPatch = private.isRetail and select(4, _G.GetBuildInfo()) >= 100002
+private.isPatch = private.isRetail and select(4, _G.GetBuildInfo()) >= 100105
 
 local debugProjectID = {
     [0] = private.isRetail,