[retail] Make first pass on scrollbar fix

Skin/Classic/Interface/FrameXML/CinematicFrame.lua

@@ -6,9 +6,7 @@ if private.shouldSkip() then return end
 
 --[[ Core ]]
 local Aurora = private.Aurora
-local Base = Aurora.Base
 local Hook, Skin = Aurora.Hook, Aurora.Skin
-local Color = Aurora.Color
 
 do --[[ FrameXML\CinematicFrame.lua ]]
     function Hook.CinematicFrameCloseDialog_OnShow(self)

Skin/Classic/Interface_Wrath/FrameXML/RaidFrame.lua

@@ -27,7 +27,7 @@ function private.FrameXML.RaidFrame()
     -------------------
     Skin.DialogBorderDarkTemplate(_G.RaidInfoFrame)
     _G.RaidInfoFrame:SetPoint("TOPLEFT", _G.RaidFrame, "TOPRIGHT", 1, -28)
-    local bg = RaidInfoFrame:GetBackdropTexture("bg")
+    local bg = _G.RaidInfoFrame:GetBackdropTexture("bg")
 
     _G.RaidInfoDetailHeader:Hide()
     _G.RaidInfoDetailFooter:Hide()

Skin/Retail/Interface/AddOns/Blizzard_ArchaeologyUI.lua

@@ -173,7 +173,7 @@ function private.AddOns.Blizzard_ArchaeologyUI()
     _G.ArchaeologyFrameArtifactPageSolveFrameStatusBarBarBG:Hide()
 
     Skin.UIPanelButtonTemplate(artifactPage.backButton)
-    Skin.MinimalScrollFrameTemplate(artifactPage.historyScroll)
+    Skin.ScrollFrameTemplate(artifactPage.historyScroll)
     artifactPage.historyScroll.child.text:SetTextColor(r, g, b)
 
 
@@ -196,7 +196,7 @@ function private.AddOns.Blizzard_ArchaeologyUI()
     _G.ArchaeologyFrameHelpPageDigTex:SetTexCoord(0.056640625, 0.857421875, 0.171875, 0.90234375)
     _G.ArchaeologyFrameHelpPageDigTitle:SetTextColor(r, g, b)
     _G.ArchaeologyFrameHelpPageDigTitle:SetPoint("TOP", _G.ArchaeologyFrameHelpPageDigTex, 0, 19)
-    Skin.MinimalScrollFrameTemplate(_G.ArchaeologyFrameHelpPageHelpScroll)
+    Skin.ScrollFrameTemplate(_G.ArchaeologyFrameHelpPageHelpScroll)
     _G.ArchaeologyFrameHelpPageHelpScrollHelpText:SetTextColor(r, g, b)
 
 

Skin/Retail/Interface/AddOns/Blizzard_Calendar.lua

@@ -86,9 +86,6 @@ do --[[ AddOns\Blizzard_Calendar.xml ]]
     function Skin.CalendarEventCloseButtonTemplate(Button)
         Skin.CalendarCloseButtonTemplate(Button)
     end
-    function Skin.CalendarEventDescriptionScrollFrame(ScrollFrame)
-        Skin.UIPanelScrollFrameTemplate(ScrollFrame)
-    end
     function Skin.CalendarEventInviteSortButtonTemplate(Button)
         local arrow = Button:GetRegions()
         arrow:SetSize(10, 5)

Skin/Retail/Interface/AddOns/Blizzard_Channels.lua

@@ -93,13 +93,13 @@ do --[[ AddOns\Blizzard_Channels.xml ]]
     do --[[ ChannelList.xml ]]
         function Skin.ChannelListTemplate(ScrollFrame)
             Util.Mixin(ScrollFrame.headerButtonPool, Hook.ObjectPoolMixin)
-            Skin.UIPanelStretchableArtScrollBarTemplate(ScrollFrame.ScrollBar)
+            Skin.ScrollFrameTemplate(ScrollFrame)
         end
     end
     do --[[ ChannelRoster.xml ]]
         function Skin.ChannelRosterTemplate(Frame)
             Skin.WowScrollBoxList(Frame.ScrollBox)
-            Skin.WowTrimScrollBar(Frame.ScrollBar)
+            Skin.MinimalScrollBar(Frame.ScrollBar)
         end
     end
 end

Skin/Retail/Interface/AddOns/Blizzard_Communities.lua

@@ -150,8 +150,7 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
             Frame.BottomFiligree:Hide()
 
             Skin.WowScrollBoxList(Frame.ScrollBox)
-            Skin.WowTrimScrollBar(Frame.ScrollBar)
-            Frame.ScrollBar:GetChildren():Hide() -- .Background from WowTrimScrollBar is overwritten with a texture
+            Skin.MinimalScrollBar(Frame.ScrollBar)
             Frame.FilligreeOverlay:Hide()
             Skin.InsetFrameTemplate(Frame.InsetFrame)
         end
@@ -173,8 +172,7 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
             Frame.ColumnDisplay.InsetBorderLeft:Hide()
 
             Skin.WowScrollBoxList(Frame.ScrollBox)
-            Skin.WowTrimScrollBar(Frame.ScrollBar)
-            Frame.ScrollBar:GetChildren():Hide() -- .Background from WowTrimScrollBar is overwritten with a texture
+            Skin.MinimalScrollBar(Frame.ScrollBar)
             Skin.InsetFrameTemplate(Frame.InsetFrame)
         end
         function Skin.CommunitiesFrameMemberListDropDownMenuTemplate(Frame)
@@ -185,16 +183,8 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
     end
     do --[[ CommunitiesChatFrame ]]
         function Skin.CommunitiesChatTemplate(Frame)
-            local ScrollBar = Frame.MessageFrame.ScrollBar
-            Skin.HybridScrollBarBackgroundTemplate(Frame.MessageFrame.ScrollBar)
-
-            ScrollBar.ScrollUp:SetPoint("BOTTOM", ScrollBar, "TOP")
-            Skin.UIPanelScrollUpButtonTemplate(ScrollBar.ScrollUp)
-
-            ScrollBar.ScrollDown:SetPoint("TOP", ScrollBar, "BOTTOM")
-            Skin.UIPanelScrollDownButtonTemplate(ScrollBar.ScrollDown)
-
-            local _, JumpToUnreadButton = Frame:GetChildren()
+            Skin.MinimalScrollBar(Frame.ScrollBar)
+            local _, _, JumpToUnreadButton = Frame:GetChildren()
             Skin.UIPanelButtonTemplate(JumpToUnreadButton)
             --Skin.UIPanelButtonTemplate(Frame.JumpToUnreadButton)
             Skin.InsetFrameTemplate(Frame.InsetFrame)
@@ -254,7 +244,7 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
             Frame.Selector.Center = Frame.BG
             Skin.SelectionFrameTemplate(Frame.Selector)
             Skin.CommunitiesListDropDownMenuTemplate(Frame.CommunitiesListDropDownMenu)
-            Skin.UIPanelStretchableArtScrollBarTemplate(Frame.ScrollFrame.ScrollBar)
+            Skin.ScrollFrameTemplate(Frame.ScrollFrame)
             Skin.UICheckButtonTemplate(Frame.ScrollFrame.Child.QuickJoinButton)
             Skin.CommunitiesMassNotificationsSettingsButtonTemplate(Frame.ScrollFrame.Child.NoneButton)
             Skin.CommunitiesMassNotificationsSettingsButtonTemplate(Frame.ScrollFrame.Child.AllButton)
@@ -281,8 +271,7 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
         function Skin.ClubFinderApplicantListFrameTemplate(Frame)
             Skin.ColumnDisplayTemplate(Frame.ColumnDisplay)
             Skin.WowScrollBoxList(Frame.ScrollBox)
-            Skin.WowTrimScrollBar(Frame.ScrollBar)
-            Frame.ScrollBar:GetChildren():Hide() -- .Background from WowTrimScrollBar is overwritten with a texture
+            Skin.MinimalScrollBar(Frame.ScrollBar)
             Skin.InsetFrameTemplate(Frame.InsetFrame)
         end
     end
@@ -400,7 +389,7 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
         end
         function Skin.ClubFinderCommunitiesCardFrameTemplate(Frame)
             Skin.WowScrollBoxList(Frame.ScrollBox)
-            Skin.WowTrimScrollBar(Frame.ScrollBar)
+            Skin.MinimalScrollBar(Frame.ScrollBar)
         end
         function Skin.ClubFinderOptionsTemplate(Frame)
             Skin.ClubFinderFilterDropdownTemplate(Frame.ClubFilterDropdown)
@@ -448,8 +437,7 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
             Frame.ArtOverlay.TopRight:ClearAllPoints()
 
             Skin.WowScrollBoxList(Frame.ScrollBox)
-            Skin.WowTrimScrollBar(Frame.ScrollBar)
-            Frame.ScrollBar:GetChildren():Hide() -- .Background from WowTrimScrollBar is overwritten with a texture
+            Skin.MinimalScrollBar(Frame.ScrollBar)
             Skin.ColumnDisplayTemplate(Frame.ColumnDisplay)
             Frame.ColumnDisplay.InsetBorderTopLeft:ClearAllPoints()
             Frame.ColumnDisplay.InsetBorderTopRight:ClearAllPoints()
@@ -492,7 +480,7 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
         function Skin.CommunitiesGuildRewardsFrameTemplate(Frame)
             Frame.Bg:Hide()
             Skin.WowScrollBoxList(Frame.ScrollBox)
-            Skin.WowTrimScrollBar(Frame.ScrollBar)
+            Skin.MinimalScrollBar(Frame.ScrollBar)
         end
     end
     do --[[ GuildPerks ]]
@@ -507,8 +495,7 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
         function Skin.CommunitiesGuildPerksFrameTemplate(Frame)
             Frame:GetRegions():Hide()
             Skin.WowScrollBoxList(Frame.ScrollBox)
-            Skin.WowTrimScrollBar(Frame.ScrollBar)
-            Frame.ScrollBar:GetChildren():Hide() -- .Background from WowTrimScrollBar is overwritten with a texture
+            Skin.MinimalScrollBar(Frame.ScrollBar)
         end
     end
     do --[[ GuildInfo ]]
@@ -526,8 +513,8 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
 
             Frame.MOTDScrollFrame:SetWidth(246)
             Frame.MOTDScrollFrame.MOTD:SetWidth(246)
-            Skin.MinimalScrollFrameTemplate(Frame.MOTDScrollFrame)
-            Skin.MinimalScrollFrameTemplate(Frame.DetailsFrame)
+            Skin.ScrollFrameTemplate(Frame.MOTDScrollFrame)
+            Skin.ScrollFrameTemplate(Frame.DetailsFrame)
         end
     end
     do --[[ GuildNews ]]
@@ -598,8 +585,7 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
             Frame.Header:Hide()
 
             Skin.WowScrollBoxList(Frame.ScrollBox)
-            Skin.WowTrimScrollBar(Frame.ScrollBar)
-            Frame.ScrollBar:GetChildren():Hide() -- .Background from WowTrimScrollBar is overwritten with a texture
+            Skin.MinimalScrollBar(Frame.ScrollBar)
             Skin.CommunitiesGuildNewsBossModelTemplate(Frame.BossModel)
         end
     end
@@ -724,7 +710,7 @@ function private.AddOns.Blizzard_Communities()
     CommunitiesAvatarPickerDialog.Selector.Center = CommunitiesAvatarPickerDialog:GetRegions()
     Skin.SelectionFrameTemplate(CommunitiesAvatarPickerDialog.Selector)
     Skin.WowScrollBoxList(CommunitiesAvatarPickerDialog.ScrollBox)
-    Skin.WowTrimScrollBar(CommunitiesAvatarPickerDialog.ScrollBar)
+    Skin.MinimalScrollBar(CommunitiesAvatarPickerDialog.ScrollBar)
 
     ----====####$$$$%%%%$$$$####====----
     --  CommunitiesAddDialogInsecure  --
@@ -826,7 +812,7 @@ function private.AddOns.Blizzard_Communities()
     local close1, container, close2 = _G.CommunitiesGuildLogFrame:GetChildren()
     Skin.UIPanelCloseButton(close1) -- BlizzWTF: close1 and close2 have the same global name
     Util.HideNineSlice(container)
-    Skin.MinimalScrollFrameTemplate(container.ScrollFrame)
+    Skin.ScrollFrameTemplate(container.ScrollFrame)
     Skin.UIPanelButtonTemplate(close2)
 
     ----====####$$$$%%%%%$$$$####====----

Skin/Retail/Interface/AddOns/Blizzard_EncounterJournal.lua

@@ -120,9 +120,6 @@ end
 
 do --[[ AddOns\Blizzard_EncounterJournal.xml ]]
     do --[[ Blizzard_EncounterJournal ]]
-        function Skin.EncounterJournalScrollBarTemplate(Slider)
-            Skin.WowTrimScrollBar(Slider)
-        end
         function Skin.EJButtonTemplate(Button)
             Skin.FrameTypeButton(Button)
 
@@ -151,15 +148,20 @@ do --[[ AddOns\Blizzard_EncounterJournal.xml ]]
             _G[name.."IconFrame"]:SetAlpha(0)
             Base.CropIcon(Button.icon, Button)
         end
+        function Skin.EncounterSearchAllSMTemplate(Button)
+            Skin.SearchBoxListAllButtonTemplate(Button)
+        end
         function Skin.EncounterSearchLGTemplate(Button)
-            SkinSearchButton(Button)
-
-            local name = Button:GetName()
-            _G[name.."IconFrame"]:SetAlpha(0)
+            Button.iconFrame:SetAlpha(0)
             Base.CropIcon(Button.icon, Button)
-
             Button.path:SetTextColor(Color.grayLight:GetRGB())
             Button.resultType:SetTextColor(Color.grayLight:GetRGB())
+
+            Button:ClearNormalTexture()
+            Button:ClearPushedTexture()
+
+            local r, g, b = Color.highlight:GetRGB()
+            Button:GetHighlightTexture():SetColorTexture(r, g, b, 0.2)
         end
         function Skin.EncounterCreatureButtonTemplate(Button)
             Button:ClearNormalTexture()
@@ -286,9 +288,6 @@ do --[[ AddOns\Blizzard_EncounterJournal.xml ]]
         function Skin.BottomEncounterTierTabTemplate(Button)
             Skin.PanelTabButtonTemplate(Button)
         end
-        function Skin.EncounterJournalScrollBarTemplateOld(Slider)
-            Skin.MinimalScrollBarTemplate(Slider)
-        end
     end
     do --[[ Blizzard_LootJournal ]]
         function Skin.RuneforgeLegendaryPowerLootJournalTemplate(Button)
@@ -325,50 +324,9 @@ function private.AddOns.Blizzard_EncounterJournal()
     local EncounterJournal = _G.EncounterJournal
     Skin.PortraitFrameTemplate(EncounterJournal)
 
+    Skin.SearchBoxListTemplate(EncounterJournal.searchBox)
+    Skin.BottomPopupScrollBoxTemplate(EncounterJournal.searchResults)
 
-    ------------
-    -- Search --
-    ------------
-    local searchBox = EncounterJournal.searchBox
-    Skin.SearchBoxTemplate(searchBox)
-
-    local searchPreview = searchBox.searchPreviewContainer
-    searchPreview:DisableDrawLayer("ARTWORK")
-    Skin.FrameTypeFrame(searchPreview)
-    local searchPreviewBG = searchPreview:GetBackdropTexture("bg")
-    searchPreviewBG:SetPoint("BOTTOMRIGHT", searchBox.showAllResults, 0, 0)
-
-    for i = 1, #searchBox.searchPreview do
-        Skin.EncounterSearchSMTemplate(searchBox.searchPreview[i])
-    end
-    SkinSearchButton(searchBox.showAllResults)
-
-    local searchResults = EncounterJournal.searchResults
-    Skin.FrameTypeFrame(searchResults)
-
-    local titleText = searchResults.TitleText
-    titleText:ClearAllPoints()
-    titleText:SetPoint("TOPLEFT")
-    titleText:SetPoint("BOTTOMRIGHT", searchResults, "TOPRIGHT", 0, -private.FRAME_TITLE_HEIGHT)
-
-    _G.EncounterJournalSearchResultsBg:Hide()
-    _G.EncounterJournalSearchResultsTopLeftCorner:Hide()
-    _G.EncounterJournalSearchResultsTopRightCorner:Hide()
-    _G.EncounterJournalSearchResultsTopBorder:Hide()
-    searchResults.leftBorderBar:Hide()
-    _G.EncounterJournalSearchResultsRightBorder:Hide()
-    _G.EncounterJournalSearchResultsTopTileStreaks:Hide()
-    _G.EncounterJournalSearchResultsTopLeftCorner2:Hide()
-    _G.EncounterJournalSearchResultsTopRightCorner2:Hide()
-    _G.EncounterJournalSearchResultsTopBorder2:Hide()
-
-    Skin.UIPanelCloseButton(_G.EncounterJournalSearchResultsCloseButton)
-    Skin.WowScrollBoxList(searchResults.ScrollBox)
-    Skin.WowTrimScrollBar(searchResults.ScrollBar)
-
-    --------------------
-    -- InstanceSelect --
-    --------------------
     local navBar = EncounterJournal.navBar
     -- Skin.NavBarTemplate(navBar) -- this is skinned from hooks in NavigationBar.lua
     navBar:SetPoint("TOPLEFT", 10, -private.FRAME_TITLE_HEIGHT)
@@ -381,11 +339,14 @@ function private.AddOns.Blizzard_EncounterJournal()
 
     Skin.InsetFrameTemplate(EncounterJournal.inset)
 
+    --------------------
+    -- InstanceSelect --
+    --------------------
     local instanceSelect = EncounterJournal.instanceSelect
-    instanceSelect.bg:Hide()
+    instanceSelect.bg:SetAlpha(0)
     Skin.UIDropDownMenuTemplate(instanceSelect.tierDropDown)
     Skin.WowScrollBoxList(instanceSelect.ScrollBox)
-    Skin.WowTrimScrollBar(instanceSelect.ScrollBar)
+    Skin.MinimalScrollBar(instanceSelect.ScrollBar)
     Util.Mixin(instanceSelect.ScrollBox.view.poolCollection, Hook.FramePoolCollectionMixin)
 
 
@@ -410,7 +371,7 @@ function private.AddOns.Blizzard_EncounterJournal()
 
     Skin.ScrollingFontTemplate(instance.LoreScrollingFont)
     instance.LoreScrollingFont:SetTextColor(Color.grayLight)
-    Skin.EncounterJournalScrollBarTemplate(instance.LoreScrollBar)
+    Skin.MinimalScrollBar(instance.LoreScrollBar)
 
     local info = encounter.info
     info:GetRegions():Hide()
@@ -440,7 +401,7 @@ function private.AddOns.Blizzard_EncounterJournal()
 
     Skin.WowScrollBoxList(info.BossesScrollBox)
     Util.Mixin(info.BossesScrollBox.view.poolCollection, Hook.FramePoolCollectionMixin)
-    Skin.EncounterJournalScrollBarTemplate(info.BossesScrollBar)
+    Skin.MinimalScrollBar(info.BossesScrollBar)
     Skin.EJButtonTemplate(info.difficulty)
 
     Base.SetBackdrop(info.reset, Color.button)
@@ -449,11 +410,11 @@ function private.AddOns.Blizzard_EncounterJournal()
     info.reset:ClearPushedTexture()
     info.reset:ClearHighlightTexture()
 
-    Skin.EncounterJournalScrollBarTemplateOld(info.detailsScroll.ScrollBar)
+    Skin.ScrollFrameTemplate(info.detailsScroll)
     info.detailsScroll.child.description:SetTextColor(Color.grayLight:GetRGB())
 
     local overviewScroll = info.overviewScroll
-    Skin.EncounterJournalScrollBarTemplateOld(overviewScroll.ScrollBar)
+    Skin.ScrollFrameTemplate(overviewScroll)
     overviewScroll.child.loreDescription:SetTextColor(Color.grayLight:GetRGB())
     overviewScroll.child.header:SetDesaturated(true)
     _G.EncounterJournalEncounterFrameInfoOverviewScrollFrameScrollChildTitle:SetTextColor(Color.white:GetRGB())
@@ -465,7 +426,7 @@ function private.AddOns.Blizzard_EncounterJournal()
     LootContainer.classClearFilter.bg = classFilterBG
 
     Skin.WowScrollBoxList(LootContainer.ScrollBox)
-    Skin.EncounterJournalScrollBarTemplate(LootContainer.ScrollBar)
+    Skin.MinimalScrollBar(LootContainer.ScrollBar)
     Skin.EJButtonTemplate(LootContainer.filter)
     Skin.EJButtonTemplate(LootContainer.slotFilter)
 
@@ -515,11 +476,13 @@ function private.AddOns.Blizzard_EncounterJournal()
     ------------------
     -- Tab Frames --
     ------------------
+    Skin.BottomEncounterTierTabTemplate(EncounterJournal.MonthlyActivitiesTab)
     Skin.BottomEncounterTierTabTemplate(EncounterJournal.suggestTab)
     Skin.BottomEncounterTierTabTemplate(EncounterJournal.dungeonsTab)
     Skin.BottomEncounterTierTabTemplate(EncounterJournal.raidsTab)
     Skin.BottomEncounterTierTabTemplate(EncounterJournal.LootJournalTab)
     Util.PositionRelative("TOPLEFT", EncounterJournal, "BOTTOMLEFT", 20, -1, 1, "Right", {
+        EncounterJournal.MonthlyActivitiesTab,
         EncounterJournal.suggestTab,
         EncounterJournal.dungeonsTab,
         EncounterJournal.raidsTab,
@@ -561,5 +524,5 @@ function private.AddOns.Blizzard_EncounterJournal()
     Skin.EJButtonTemplate(LootJournal.ClassDropDownButton)
     Skin.EJButtonTemplate(LootJournal.RuneforgePowerFilterDropDownButton)
     Skin.WowScrollBoxList(LootJournal.ScrollBox)
-    Skin.EncounterJournalScrollBarTemplate(LootJournal.ScrollBar)
+    Skin.MinimalScrollBar(LootJournal.ScrollBar)
 end

Skin/Retail/Interface/AddOns/Blizzard_EventTrace.lua

@@ -91,11 +91,11 @@ function private.AddOns.Blizzard_EventTrace()
 
     Skin.WowScrollBoxList(Log.Events.ScrollBox)
     Log.Events.ScrollBox:GetRegions():Hide()
-    Skin.WowTrimScrollBar(Log.Events.ScrollBar)
+    Skin.MinimalScrollBar(Log.Events.ScrollBar)
 
     Skin.WowScrollBoxList(Log.Search.ScrollBox)
     Log.Search.ScrollBox:GetRegions():Hide()
-    Skin.WowTrimScrollBar(Log.Search.ScrollBar)
+    Skin.MinimalScrollBar(Log.Search.ScrollBar)
 
 
     local Filter = EventTrace.Filter
@@ -105,5 +105,5 @@ function private.AddOns.Blizzard_EventTrace()
 
     Skin.WowScrollBoxList(Filter.ScrollBox)
     Filter.ScrollBox:GetRegions():Hide()
-    Skin.WowTrimScrollBar(Filter.ScrollBar)
+    Skin.MinimalScrollBar(Filter.ScrollBar)
 end