[retail] Updates for Aurora for 10.1.7 (#103)

* fix: PetStableModel replaced by PetStableModelScene [Squishses]
* update: added new entries to Skin/Interface/FrameXML/FrameXML.xml from 10.1.7
* update: toc
* fix: Updated list of role icons [Squishses]
* fix: all, or most, tabs should work now
* fix: WardrobeItemsModelTemplate - Blizz moved hight in the return from GetRegions!?
* removed: FrameXML\QueueStatusFrame.xml - no longer supports RoleIcon1-3 and SetTexture as before.. needs a rework
* fix: Affixes not available before you have done an mythic+
* update: workaround for LFG icons not available character cannot perform role
* fix: LFG Dialog PopUp Error solved
* add: report notice on missing NineSlice
* fix: ReadyCheck as NineSlice

Aurora.toc

@@ -1,11 +1,11 @@
-## Interface: 100100
+## Interface: 100107
 ## Interface-Classic: 11403
 ## Interface-Wrath: 30400
 ## Title: Aurora
 ## IconAtlas: callings-backhighlight-full
 ## Notes: Minimalistic window theme.
 ## Author: Haleth/Lightsword, Gethe
-## Version: 10.1.5.1
+## Version: 10.1.7.0-beta
 ## LoadWith: Blizzard_CompactRaidFrames
 ## OptionalDeps: Ace3, LibTextDump-1.0, BugSack, WagoAnalytics
 ## SavedVariables: AuroraConfig

Skin/Interface/AddOns/Blizzard_ChallengesUI.lua

@@ -111,7 +111,9 @@ function private.AddOns.Blizzard_ChallengesUI()
 
     ChallengesFrame.WeeklyInfo:SetPoint("TOPLEFT")
     ChallengesFrame.WeeklyInfo:SetPoint("BOTTOMRIGHT")
-    Skin.ChallengesKeystoneFrameAffixTemplate(ChallengesFrame.WeeklyInfo.Child.Affixes[1])
+    if ChallengesFrame.WeeklyInfo.Child.Affixes == not nil then
+        Skin.ChallengesKeystoneFrameAffixTemplate(ChallengesFrame.WeeklyInfo.Child.Affixes[1])
+    end
     Skin.MythicPlusSeasonChangesNoticeTemplate(ChallengesFrame.SeasonChangeNoticeFrame)
     ChallengesFrame.SeasonChangeNoticeFrame:ClearAllPoints()
     ChallengesFrame.SeasonChangeNoticeFrame:SetPoint("TOPLEFT", 0, -private.FRAME_TITLE_HEIGHT)

Skin/Interface/AddOns/Blizzard_Collections.lua

@@ -428,7 +428,7 @@ do --[[ AddOns\Blizzard_Collections.xml ]]
     end
     do --[[ Blizzard_Wardrobe ]]
         function Skin.WardrobeItemsModelTemplate(DressUpModel)
-            local bg, _, _, _, _, highlight = DressUpModel:GetRegions()
+            local bg, _, _, highlight = DressUpModel:GetRegions()
             bg:Hide()
             DressUpModel.Border:Hide()
 
@@ -533,8 +533,6 @@ function private.AddOns.Blizzard_Collections()
         _G.CollectionsJournalTab4,
         _G.CollectionsJournalTab5,
     })
-
-
     ----====####$$$$%%%%$$$$####====----
     --    Blizzard_MountCollection    --
     ----====####$$$$%%%%$$$$####====----

Skin/Interface/AddOns/Blizzard_Communities.lua

@@ -388,6 +388,9 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
             ["UI-Frame-TankIcon"] = "iconTANK",
             ["UI-Frame-HealerIcon"] = "iconHEALER",
             ["UI-Frame-DpsIcon"] = "iconDAMAGER",
+            ["UI-LFG-RoleIcon-Tank"] = "iconTANK",
+            ["UI-LFG-RoleIcon-Healer"] = "iconHEALER",
+            ["UI-LFG-RoleIcon-DPS"] = "iconDAMAGER",
         }
         function Skin.ClubFinderRoleTemplate(Frame)
             local atlas = Frame.Icon:GetAtlas()

Skin/Interface/FrameXML/FrameXML.xml

@@ -4,10 +4,6 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
         _G.AURORA_DEBUG_PROJECT = 0
     </Script>
 
-
-
-
-
     <!--Script file="..\SharedXML\SharedConstants.lua"/-->
 
     <!--## add C namespace augmentations here-->
@@ -25,6 +21,7 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="..\SharedXML\ExportUtil.lua"/-->
     <!--Script file="..\SharedXML\Rectangle.lua"/-->
     <!--Script file="..\SharedXML\TextureUtil.lua"/-->
+    <!--Script file="..\SharedXML\AddOnUtil.lua"/-->
     <!--Script file="..\SharedXML\Flags.lua"/-->
     <!--Script file="..\SharedXML\CallbackRegistry.lua"/-->
     <!--Script file="..\SharedXML\CallbackRegistrant.lua"/-->
@@ -146,6 +143,11 @@ https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
     <!--Script file="ObjectAPI\CovenantCalling.lua"/-->
 
     <!--## add new modules below here-->
+    <!--Script file="..\SharedXML\PingUtil.lua"/-->
+    <!--Script file="..\SharedXML\PingAttributes.xml"/-->
+    <!--Script file="..\SharedXML\PingableType.lua"/-->
+    <!--Script file="..\SharedXML\Blizzard_RadialWheel.lua"/-->
+    <!--Script file="..\SharedXML\Blizzard_RadialWheel.lua"/-->
     <!--Script file="..\SharedXML\Backdrop.lua"/-->
     <Script file="ChatBubbleTemplates.lua"/>
     <!--Script file="WorldFrame.lua"/-->

Skin/Interface/FrameXML/LFGFrame.lua

@@ -13,6 +13,9 @@ local Color, Util = Aurora.Color, Aurora.Util
 do --[[ FrameXML\LFGFrame.lua ]]
     function Hook.LFG_SetRoleIconIncentive(roleButton, incentiveIndex)
         local roleIcon = roleButton:GetNormalTexture()
+        if roleIcon._auroraBorder == nil then
+            return
+        end
         if incentiveIndex then
             roleIcon._auroraBorder:SetColorTexture(Color.yellow:GetRGB())
         else
@@ -30,7 +33,6 @@ do --[[ FrameXML\LFGFrame.lua ]]
             role = "DAMAGER"
         end
 
-        Util.HideNineSlice(_G.LFGDungeonReadyDialog)
         if not hasResponded then
             if subtypeID == _G.LFG_SUBTYPEID_RAID then
                 _G.LFGDungeonReadyDialog.Border:SetBackdropBorderColor(Color.yellow, 1)

Skin/Interface/FrameXML/PetStable.lua

@@ -84,12 +84,9 @@ function private.FrameXML.PetStable()
 
     Skin.InsetFrameTemplate(PetStableFrame.BottomInset)
     _G.PetStableFrameStableBg:Hide()
-
-    _G.PetStableModel:SetPoint("TOPLEFT", PetStableFrame.Inset)
-    _G.PetStableModel:SetPoint("BOTTOMRIGHT", PetStableFrame.Inset)
-    _G.PetStableModelRotateLeftButton:Hide()
-    _G.PetStableModelRotateRightButton:Hide()
-    _G.PetStableModelShadow:Hide()
+    _G.PetStableModelScene:SetPoint("TOPLEFT", PetStableFrame.Inset,"TOPLEFT",0,-30)
+    _G.PetStableModelScene:SetPoint("BOTTOMRIGHT", PetStableFrame.Inset)
+    _G.PetStableModelScene.ControlFrame:Hide()
 
     _G.PetStablePetInfo:SetPoint("TOPLEFT", PetStableFrame.Inset)
     _G.PetStablePetInfo:SetPoint("BOTTOMRIGHT", PetStableFrame.Inset, "TOPRIGHT", 0, -52)

Skin/Interface/FrameXML/QueueStatusFrame.lua

@@ -46,32 +46,32 @@ do --[[ FrameXML\QueueStatusFrame.lua ]]
     end
 end
 
-do --[[ FrameXML\QueueStatusFrame.xml ]]
-    function Skin.QueueStatusRoleCountTemplate(Frame)
-        local debugName = Frame:GetDebugName()
-        if debugName:find("Healer") then
-            Base.SetTexture(Frame.Texture, "iconHEALER")
-        elseif debugName:find("Tank") then
-            Base.SetTexture(Frame.Texture, "iconTANK")
-        elseif debugName:find("Damager") then
-            Base.SetTexture(Frame.Texture, "iconDAMAGER")
-        end
-
-        Frame.Cover:SetColorTexture(0, 0, 0)
-    end
-    function Skin.QueueStatusEntryTemplate(Frame)
-        Util.PositionRelative("TOPRIGHT", Frame, "TOPRIGHT", -5, -5, 3, "Left", {
-            Frame.RoleIcon1,
-            Frame.RoleIcon2,
-            Frame.RoleIcon3,
-        })
+-- do --[[ FrameXML\QueueStatusFrame.xml ]]
+    -- NEEDS REWORK...
+    -- function Skin.QueueStatusRoleCountTemplate(Frame)
+    --     local debugName = Frame:GetDebugName()
+    --     if debugName:find("Healer") then
+    --         Base.SetTexture(Frame.RoleIcon.Texture, _G.GetIconForRole("HEALER"))
+    --     elseif debugName:find("Tank") then
+    --         Base.SetTexture(Frame.RoleIcon.Texture, "iconTANK")
+    --     elseif debugName:find("Damager") then
+    --         Base.SetTexture(Frame.RoleIcon.Texture, "iconDAMAGER")
+    --     end
+    --     -- Frame.Cover:SetColorTexture(0, 0, 0)
+    -- end
+    -- function Skin.QueueStatusEntryTemplate(Frame)
+    --     Util.PositionRelative("TOPRIGHT", Frame, "TOPRIGHT", -5, -5, 3, "Left", {
+    --         Frame.RoleIcon1,
+    --         Frame.RoleIcon2,
+    --         Frame.RoleIcon3,
+    --     })
 
-        Frame.EntrySeparator:SetHeight(1)
-        Skin.QueueStatusRoleCountTemplate(Frame.HealersFound)
-        Skin.QueueStatusRoleCountTemplate(Frame.TanksFound)
-        Skin.QueueStatusRoleCountTemplate(Frame.DamagersFound)
-    end
-end
+    --     Frame.EntrySeparator:SetHeight(1)
+    --     Skin.QueueStatusRoleCountTemplate(Frame.HealersFound)
+    --     Skin.QueueStatusRoleCountTemplate(Frame.TanksFound)
+    --     Skin.QueueStatusRoleCountTemplate(Frame.DamagersFound)
+    -- end
+-- end
 
 function private.FrameXML.QueueStatusFrame()
      _G.hooksecurefunc("QueueStatusEntry_SetFullDisplay", Hook.QueueStatusEntry_SetFullDisplay)

Skin/Interface/FrameXML/ReadyCheck.lua

@@ -1,5 +1,7 @@
 local _, private = ...
-if private.shouldSkip() then return end
+if private.shouldSkip() then
+    return
+end
 
 --[[ Lua Globals ]]
 -- luacheck: globals
@@ -9,11 +11,11 @@ local Aurora = private.Aurora
 local Skin = Aurora.Skin
 
 function private.FrameXML.ReadyCheck()
-    Skin.FrameTypeFrame(_G.ReadyCheckListenerFrame)
-    _G.ReadyCheckPortrait:SetAlpha(0)
-    _G.select(2, _G.ReadyCheckListenerFrame:GetRegions()):Hide()
-    _G.ReadyCheckFrameText:SetPoint("CENTER", _G.ReadyCheckListenerFrame, "TOP", 0, -30)
-
+    local ReadyCheckListenerFrame = _G.ReadyCheckListenerFrame
+    Skin.NineSlicePanelTemplate(ReadyCheckListenerFrame.NineSlice)
+    ReadyCheckListenerFrame.NineSlice:SetFrameLevel(1)
+    _G.ReadyCheckFrameText:SetPoint("TOP", ReadyCheckListenerFrame.NineSlice, "TOP", 0, -30)
+    _G.select(2, ReadyCheckListenerFrame.NineSlice:GetRegions()):Hide()
     Skin.UIPanelButtonTemplate(_G.ReadyCheckFrameYesButton)
     _G.ReadyCheckFrameYesButton:SetPoint("TOPRIGHT", -184, -55)
     Skin.UIPanelButtonTemplate(_G.ReadyCheckFrameNoButton)

Skin/skin.lua

@@ -9,14 +9,12 @@ local Base = Aurora.Base
 local Skin = Aurora.Skin
 local Color, Util = Aurora.Color, Aurora.Util
 
-
 do -- Frame
     function Skin.FrameTypeFrame(Frame)
         Base.SetBackdrop(Frame, Color.frame, Util.GetFrameAlpha())
     end
 end
 
-
 do -- Button
     local function SetTexturesToColor(self, color)
         if self._auroraTextures then
@@ -32,10 +30,11 @@ do -- Button
         SetTexturesToColor(self, returnColor)
     end
 
-
     local DISABLED_COLOR = Color.Lightness(Color.button, -0.3)
     local function Hook_Enable(self)
-        if self.isEnabled then return end
+        if self.isEnabled then
+            return
+        end
 
         if self._isMinimal then
             SetTexturesToColor(self, self._enabledColor)
@@ -48,8 +47,9 @@ do -- Button
         self.isDisabled = not self.isEnabled
     end
     local function Hook_Disable(self)
-        if self.isDisabled then return end
-
+        if self.isDisabled then
+            return
+        end
         if self._isMinimal then
             SetTexturesToColor(self, self._disabledColor)
         else
@@ -68,10 +68,18 @@ do -- Button
         end
     end
     function Skin.FrameTypeButton(Button, OnEnter, OnLeave)
-        _G.hooksecurefunc(Button, "Enable", Hook_Enable)
-        _G.hooksecurefunc(Button, "Disable", Hook_Disable)
+        local framesOk = true
+        if Button:GetName() then
+            local frameButtonNamed = Button:GetName()
+            if _G.string.find(frameButtonNamed, "Tab") and not _G.string.find(frameButtonNamed, "Tabard") then
+                framesOk = false
+            end
+        end
+        if framesOk then    -- not sure when these are ok to use anymore - SetEnabled triggers properly for tabs
+            _G.hooksecurefunc(Button, "Disable", Hook_Disable)
+            _G.hooksecurefunc(Button, "Enable", Hook_Enable)
+        end
         _G.hooksecurefunc(Button, "SetEnabled", Hook_SetEnabled)
-
         if Button.ClearNormalTexture then
             Button:ClearNormalTexture()
             Button:ClearPushedTexture()
@@ -98,7 +106,6 @@ do -- Button
                 r, g, b = self:GetBackdropBorderColor()
             end
 
-
             self._enabledColor = Color.Create(r, g, b, alpha or a)
 
             if disabledColor == false then
@@ -110,8 +117,8 @@ do -- Button
                     self._disabledColor = Color.Lightness(self._enabledColor, -0.3)
                 end
             end
-
-            Hook_SetEnabled(self, self:IsEnabled())
+            -- This double trigger is breaking Tabs in the updated Aurora
+            -- Hook_SetEnabled(self, self:IsEnabled())
         end
         function Button:GetButtonColor()
             return self._enabledColor, self._disabledColor
@@ -127,7 +134,6 @@ do -- Button
     end
 end
 
-
 do -- CheckButton
     function Skin.FrameTypeCheckButton(CheckButton)
         if CheckButton.ClearNormalTexture then
@@ -145,21 +151,21 @@ do -- CheckButton
     end
 end
 
-
 do -- EditBox
     function Skin.FrameTypeEditBox(EditBox)
         Base.SetBackdrop(EditBox, Color.frame)
         EditBox:SetBackdropBorderColor(Color.button)
     end
 end
 
-
 do -- StatusBar
     local function Hook_SetStatusBarTexture(self, asset)
-        if self.__SetStatusBarTexture then return end
+        if self.__SetStatusBarTexture then
+            return
+        end
         self.__SetStatusBarTexture = true
         local color = private.assetColors[asset]
-        local color2 = private.assetColors[asset.."_2"]
+        local color2 = private.assetColors[asset .. "_2"]
 
         if color then
             local texture = self:GetStatusBarTexture()
@@ -193,12 +199,15 @@ do -- StatusBar
         _G.hooksecurefunc(StatusBar, "SetStatusBarColor", Hook_SetStatusBarColor)
 
         Base.SetBackdrop(StatusBar, Color.button, Color.frame.a)
-        StatusBar:SetBackdropOption("offsets", {
-            left = -1,
-            right = -2,
-            top = -1,
-            bottom = -1,
-        })
+        StatusBar:SetBackdropOption(
+            "offsets",
+            {
+                left = -1,
+                right = -2,
+                top = -1,
+                bottom = -1
+            }
+        )
 
         local red, green, blue = StatusBar:GetStatusBarColor()
         local tex = StatusBar:GetStatusBarTexture()
@@ -223,7 +232,6 @@ do -- StatusBar
     end
 end
 
-
 do -- ScrollBar
     local function Hook_Hide(self)
         self._auroraThumb:Hide()
@@ -250,12 +258,15 @@ do -- ScrollBar
 
         Base.SetBackdrop(thumb, Color.button)
         thumb:SetShown(ScrollThumb:IsShown())
-        thumb:SetBackdropOption("offsets", {
-            left = 0,
-            right = 0,
-            top = 2,
-            bottom = 2,
-        })
+        thumb:SetBackdropOption(
+            "offsets",
+            {
+                left = 0,
+                right = 0,
+                top = 2,
+                bottom = 2
+            }
+        )
         ScrollThumb._auroraThumb = thumb
 
         _G.hooksecurefunc(ScrollThumb, "Hide", Hook_Hide)
@@ -315,13 +326,15 @@ do -- ScrollBar
     end
 
     function Skin.FrameTypeScrollBar(ScrollBar, notMinimal)
-        local back = ScrollBar.Back or ScrollBar.ScrollUpButton or _G[ScrollBar:GetName().."ScrollUpButton"]
+        local back = ScrollBar.Back or ScrollBar.ScrollUpButton or _G[ScrollBar:GetName() .. "ScrollUpButton"]
         ScrollBarButton(back, notMinimal)
 
-        local forward = ScrollBar.Forward or ScrollBar.ScrollDownButton or  _G[ScrollBar:GetName().."ScrollDownButton"]
+        local forward = ScrollBar.Forward or ScrollBar.ScrollDownButton or _G[ScrollBar:GetName() .. "ScrollDownButton"]
         ScrollBarButton(forward, notMinimal)
 
-        local thumb = (ScrollBar.Track and ScrollBar.Track.Thumb) or ScrollBar.ThumbTexture or  _G[ScrollBar:GetName().."ThumbTexture"]
+        local thumb =
+            (ScrollBar.Track and ScrollBar.Track.Thumb) or ScrollBar.ThumbTexture or
+            _G[ScrollBar:GetName() .. "ThumbTexture"]
         ScrollBarThumb(thumb)
     end
 end

Skin/util.lua

@@ -187,6 +187,7 @@ function Util.HideNineSlice(frame)
     if frame.NineSlice then
         frame.NineSlice:Hide()
     else
+        _G.print("Report: No NineSlice for", frame:GetName())
         frame:SetBackdrop(nil)
     end
 end