Skip to content

Commit

Permalink
wip for 11.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
arnvid committed Sep 13, 2024
1 parent f959377 commit 55978b8
Show file tree
Hide file tree
Showing 32 changed files with 476 additions and 379 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -533,22 +533,22 @@ function private.AddOns.Blizzard_AchievementUI()
_G.AchievementFrameTab3,
})


Base.SetBackdrop(_G.AchievementFrameFilterDropDown, Color.button)
local filterBG = _G.AchievementFrameFilterDropDown:GetBackdropTexture("bg")

_G.AchievementFrameFilterDropDown:SetPoint("TOPLEFT", bg, 148, -6)
_G.AchievementFrameFilterDropDown:SetHeight(16)
_G.AchievementFrameFilterDropDownText:SetPoint("LEFT", filterBG, 5, 0)

Skin.FrameTypeButton(_G.AchievementFrameFilterDropDownButton)
_G.AchievementFrameFilterDropDownButton:SetSize(16, 16)

local filterArrow = _G.AchievementFrameFilterDropDownButton:CreateTexture(nil, "ARTWORK")
filterArrow:SetPoint("TOPLEFT", 4, -6)
filterArrow:SetPoint("BOTTOMRIGHT", -4, 6)
Base.SetTexture(filterArrow, "arrowDown")
Base.SetTexture(filterArrow, "arrowDown")
-- FIXLATER -- dropdowns are changed to use the new widget system
-- Base.SetBackdrop(_G.AchievementFrameFilterDropDown, Color.button)
-- local filterBG = _G.AchievementFrameFilterDropDown:GetBackdropTexture("bg")

-- _G.AchievementFrameFilterDropDown:SetPoint("TOPLEFT", bg, 148, -6)
-- _G.AchievementFrameFilterDropDown:SetHeight(16)
-- _G.AchievementFrameFilterDropDownText:SetPoint("LEFT", filterBG, 5, 0)

-- Skin.FrameTypeButton(_G.AchievementFrameFilterDropDownButton)
-- _G.AchievementFrameFilterDropDownButton:SetSize(16, 16)

-- local filterArrow = _G.AchievementFrameFilterDropDownButton:CreateTexture(nil, "ARTWORK")
-- filterArrow:SetPoint("TOPLEFT", 4, -6)
-- filterArrow:SetPoint("BOTTOMRIGHT", -4, 6)
-- Base.SetTexture(filterArrow, "arrowDown")
-- Base.SetTexture(filterArrow, "arrowDown")


local SearchBox = AchievementFrame.SearchBox
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ function private.SharedXML.AddonList()
_G.AddonListScrollFrameScrollBarMiddle:Hide()
end

Skin.UIDropDownMenuTemplate(_G.AddonCharacterDropDown)
_G.AddonCharacterDropDown:SetPoint("TOPLEFT", 10, -27)
_G.AddonCharacterDropDown.Button:HookScript("OnClick", Hook.AddonListCharacterDropDownButton_OnClick)
-- FIXLATER - removed in 11.0.0
-- Skin.UIDropDownMenuTemplate(AddonList.Dropdown)
-- _G.AddonCharacterDropDown:SetPoint("TOPLEFT", 10, -27)
-- _G.AddonCharacterDropDown.Button:HookScript("OnClick", Hook.AddonListCharacterDropDownButton_OnClick)
end
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,9 @@ do --[[ FrameXML\ChatConfigFrame.xml ]]
end

function private.FrameXML.ChatConfigFrame()
_G.hooksecurefunc("ChatConfig_CreateCheckboxes", Hook.ChatConfig_CreateCheckboxes)
_G.hooksecurefunc("ChatConfig_CreateTieredCheckboxes", Hook.ChatConfig_CreateTieredCheckboxes)
-- FIXLATER
-- _G.hooksecurefunc("ChatConfig_CreateCheckboxes", Hook.ChatConfig_CreateCheckboxes)
-- _G.hooksecurefunc("ChatConfig_CreateTieredCheckboxes", Hook.ChatConfig_CreateTieredCheckboxes)
_G.hooksecurefunc("ChatConfig_CreateColorSwatches", Hook.ChatConfig_CreateColorSwatches)

local ChatConfigFrame = _G.ChatConfigFrame
Expand Down
68 changes: 39 additions & 29 deletions Skin/Interface/AddOns/Blizzard_Collections/Blizzard_Collections.lua
Original file line number Diff line number Diff line change
Expand Up @@ -57,27 +57,28 @@ do --[[ AddOns\Blizzard_Collections.lua ]]
local NO_SPEC_FILTER = 0

Hook.HeirloomsMixin = {}
function Hook.HeirloomsMixin:UpdateClassFilterDropDownText()
local text
local classFilter, specFilter = _G.C_Heirloom.GetClassAndSpecFilters()
if classFilter == NO_CLASS_FILTER then
text = _G.ALL_CLASSES
else
local classInfo = _G.C_CreatureInfo.GetClassInfo(classFilter)
if not classInfo then
return
end

local classColorStr = _G.CUSTOM_CLASS_COLORS[classInfo.classFile].colorStr
if specFilter == NO_SPEC_FILTER then
text = _G.HEIRLOOMS_CLASS_FILTER_FORMAT:format(classColorStr, classInfo.className)
else
local specName = _G.GetSpecializationNameForSpecID(specFilter)
text = _G.HEIRLOOMS_CLASS_SPEC_FILTER_FORMAT:format(classColorStr, classInfo.className, specName)
end
end
_G.UIDropDownMenu_SetText(self.classDropDown, text)
end
-- FIXLATER ?? this has been removed
-- function Hook.HeirloomsMixin:UpdateClassFilterDropDownText()
-- local text
-- local classFilter, specFilter = _G.C_Heirloom.GetClassAndSpecFilters()
-- if classFilter == UNSPECIFIED_CLASS_FILTER and specFilter == UNSPECIFIED_SPEC_FILTER then
-- text = _G.ALL_CLASSES
-- else
-- local classInfo = _G.C_CreatureInfo.GetClassInfo(classFilter)
-- if not classInfo then
-- return
-- end

-- local classColorStr = _G.CUSTOM_CLASS_COLORS[classInfo.classFile].colorStr
-- if specFilter == NO_SPEC_FILTER then
-- text = _G.HEIRLOOMS_CLASS_FILTER_FORMAT:format(classColorStr, classInfo.className)
-- else
-- local specName = _G.GetSpecializationNameForSpecID(specFilter)
-- text = _G.HEIRLOOMS_CLASS_SPEC_FILTER_FORMAT:format(classColorStr, classInfo.className, specName)
-- end
-- end
-- _G.UIDropDownMenu_SetText(self.classDropDown, text)
-- end
function Hook.HeirloomsMixin:UpdateButton(button)
if not button._auroraSkinned then
Skin.HeirloomSpellButtonTemplate(button)
Expand Down Expand Up @@ -554,7 +555,8 @@ function private.AddOns.Blizzard_Collections()

Skin.InsetFrameTemplate(MountJournal.RightInset)
Skin.SearchBoxTemplate(MountJournal.searchBox)
Skin.UIResettableDropdownButtonTemplate(_G.MountJournalFilterButton)
-- FIXLATER
-- Skin.UIResettableDropdownButtonTemplate(_G.MountJournalFilterButton)
Skin.InsetFrameTemplate3(MountJournal.MountCount)

local MountDisplay = MountJournal.MountDisplay
Expand Down Expand Up @@ -596,7 +598,8 @@ function private.AddOns.Blizzard_Collections()
Skin.InsetFrameTemplate(PetJournal.PetCardInset)
Skin.InsetFrameTemplate(PetJournal.RightInset)
Skin.SearchBoxTemplate(PetJournal.searchBox)
Skin.UIResettableDropdownButtonTemplate(_G.PetJournalFilterButton)
-- FIXLATER
-- Skin.UIResettableDropdownButtonTemplate(_G.PetJournalFilterButton)
Skin.WowScrollBoxList(PetJournal.ScrollBox)
Skin.MinimalScrollBar(PetJournal.ScrollBar)

Expand Down Expand Up @@ -681,7 +684,8 @@ function private.AddOns.Blizzard_Collections()

Skin.CollectionsProgressBarTemplate(ToyBox.progressBar)
Skin.SearchBoxTemplate(ToyBox.searchBox)
Skin.UIResettableDropdownButtonTemplate(_G.ToyBoxFilterButton)
-- FIXLATER
-- Skin.UIResettableDropdownButtonTemplate(_G.ToyBoxFilterButton)

local iconsFrame = ToyBox.iconsFrame
Skin.CollectionsBackgroundTemplate(iconsFrame)
Expand All @@ -698,12 +702,14 @@ function private.AddOns.Blizzard_Collections()
----====####$$$$%%%%%$$$$####====----
-- Blizzard_HeirloomCollection --
----====####$$$$%%%%%$$$$####====----
-- FIXLATER
local HeirloomsJournal = _G.HeirloomsJournal
Util.Mixin(HeirloomsJournal, Hook.HeirloomsMixin)

Skin.CollectionsProgressBarTemplate(HeirloomsJournal.progressBar)
Skin.SearchBoxTemplate(HeirloomsJournal.SearchBox)
Skin.UIResettableDropdownButtonTemplate(HeirloomsJournal.FilterButton)
-- FIXLATER
-- Skin.UIResettableDropdownButtonTemplate(HeirloomsJournal.FilterButton)
Skin.UIDropDownMenuTemplate(HeirloomsJournal.classDropDown)

Skin.CollectionsBackgroundTemplate(HeirloomsJournal.iconsFrame)
Expand All @@ -726,7 +732,8 @@ function private.AddOns.Blizzard_Collections()

Skin.SearchBoxTemplate(WardrobeCollectionFrame.searchBox)
Skin.CollectionsProgressBarTemplate(WardrobeCollectionFrame.progressBar)
Skin.UIResettableDropdownButtonTemplate(WardrobeCollectionFrame.FilterButton)
-- FIXLATER
-- Skin.UIResettableDropdownButtonTemplate(WardrobeCollectionFrame.FilterButton)

-- Items
local ItemsCollectionFrame = WardrobeCollectionFrame.ItemsCollectionFrame
Expand All @@ -751,7 +758,8 @@ function private.AddOns.Blizzard_Collections()

local DetailsFrame = SetsCollectionFrame.DetailsFrame
DetailsFrame.ModelFadeTexture:Hide()
Skin.UIMenuButtonStretchTemplate(DetailsFrame.VariantSetsButton)
-- FIXLATER
-- Skin.UIMenuButtonStretchTemplate(DetailsFrame.VariantSetsButton)

local SetsTransmogFrame = WardrobeCollectionFrame.SetsTransmogFrame
Util.Mixin(SetsTransmogFrame, Hook.WardrobeSetsTransmogMixin)
Expand All @@ -774,7 +782,8 @@ function private.AddOns.Blizzard_Collections()

Skin.InsetFrameTemplate(WardrobeTransmogFrame.Inset)
WardrobeTransmogFrame.Inset.BG:Hide()
Skin.WardrobeOutfitDropDownTemplate(WardrobeTransmogFrame.OutfitDropDown)
--- FIXLATER
-- Skin.WardrobeOutfitDropDownTemplate(WardrobeTransmogFrame.OutfitDropDown)

local ModelScene = WardrobeTransmogFrame.ModelScene
Skin.UIMenuButtonStretchTemplate(ModelScene.ClearAllPendingButton)
Expand All @@ -790,5 +799,6 @@ function private.AddOns.Blizzard_Collections()

Skin.SmallMoneyFrameTemplate(WardrobeTransmogFrame.MoneyFrame)
Skin.UIPanelButtonTemplate(WardrobeTransmogFrame.ApplyButton)
Skin.UIMenuButtonStretchTemplate(WardrobeTransmogFrame.SpecButton)
-- FIXLATER
-- Skin.UIMenuButtonStretchTemplate(WardrobeTransmogFrame.SpecButton)
end
66 changes: 39 additions & 27 deletions Skin/Interface/AddOns/Blizzard_Communities/Blizzard_Communities.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,15 @@ do --[[ AddOns\Blizzard_Communities.lua ]]
self.CircleMask:Hide()
Base.CropIcon(self.Icon)
self.Icon:ClearAllPoints()
self.Icon:SetPoint("CENTER", self._iconBG)
self.Name:SetPoint("LEFT", self._iconBG, "RIGHT", 11, 0)

self._iconBG:Show()
self._iconBG:SetColorTexture(Color.black:GetRGB())
self.Icon:SetPoint("CENTER")
self.Name:SetPoint("LEFT", self.Icon, "RIGHT", 11, 0)
self.Icon:Show()
self.Icon:SetColorTexture(Color.black:GetRGB())
end
if private.isRetail then
function Hook.CommunitiesListEntryMixin:Init(elementData)
local clubInfo = elementData.clubInfo
self._iconBG:SetWidth(self._iconBG:GetHeight())
-- self._iconBG:SetWidth(self._iconBG:GetHeight())

if clubInfo and self._iconBG then
local isGuild = clubInfo.clubType == _G.Enum.ClubType.Guild
Expand All @@ -49,11 +48,11 @@ do --[[ AddOns\Blizzard_Communities.lua ]]
self.Icon:SetTexCoord(0, 1, 0, 1)
self.Icon:ClearAllPoints()
self.Icon:SetSize(34, 34)
self.Icon:SetPoint("CENTER", self._iconBG)
self.Name:SetPoint("LEFT", self._iconBG, "RIGHT", 11, 0)
self.Icon:SetPoint("CENTER" )
self.Name:SetPoint("LEFT", self.Icon, "RIGHT", 11, 0)

self._iconBG:Show()
self._iconBG:SetColorTexture(Color.black:GetRGB())
self.Icon:Show()
self.Icon:SetColorTexture(Color.black:GetRGB())
end
function Hook.CommunitiesListEntryMixin:SetGuildFinder()
self.Selection:SetColorTexture(Color.green.r, Color.green.g, Color.green.b, Color.frame.a)
Expand Down Expand Up @@ -181,7 +180,8 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
Util.Mixin(Button, Hook.CommunitiesMemberListEntryMixin)
end
function Skin.CommunitiesMemberListFrameTemplate(Frame)
Skin.UICheckButtonTemplate(Frame.ShowOfflineButton)
-- FIXLATER
-- Skin.UICheckButtonTemplate(Frame.ShowOfflineButton)
Skin.ColumnDisplayTemplate(Frame.ColumnDisplay)
Frame.ColumnDisplay.InsetBorderTopLeft:Hide()
Frame.ColumnDisplay.InsetBorderTopRight:Hide()
Expand Down Expand Up @@ -253,7 +253,8 @@ do --[[ AddOns\Blizzard_Communities.xml ]]

Skin.InputBoxTemplate(Frame.NameEdit)
Skin.InputScrollFrameTemplate(Frame.Description)
Skin.UICheckButtonTemplate(Frame.TypeCheckBox)
-- FIXLATER
-- Skin.UICheckButtonTemplate(Frame.TypeCheckBox)
Skin.UIPanelButtonTemplate(Frame.Accept)
Skin.UIPanelButtonTemplate(Frame.Delete)
Skin.UIPanelButtonTemplate(Frame.Cancel)
Expand All @@ -263,7 +264,8 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
Skin.SelectionFrameTemplate(Frame.Selector)
Skin.CommunitiesListDropDownMenuTemplate(Frame.CommunitiesListDropDownMenu)
Skin.ScrollFrameTemplate(Frame.ScrollFrame)
Skin.UICheckButtonTemplate(Frame.ScrollFrame.Child.QuickJoinButton)
-- FIXLATER
-- Skin.UICheckButtonTemplate(Frame.ScrollFrame.Child.QuickJoinButton)
Skin.CommunitiesMassNotificationsSettingsButtonTemplate(Frame.ScrollFrame.Child.NoneButton)
Skin.CommunitiesMassNotificationsSettingsButtonTemplate(Frame.ScrollFrame.Child.AllButton)
end
Expand Down Expand Up @@ -313,9 +315,10 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
Skin.DialogBorderDarkTemplate(Frame.BG)

Skin.ClubFinderCheckboxTemplate(Frame.ShouldListClub.Button)
Skin.ClubFinderFocusDropdownTemplate(Frame.ClubFocusDropdown)
Skin.UIDropDownMenuTemplate(Frame.LookingForDropdown)
Skin.UIDropDownMenuTemplate(Frame.LanguageDropdown)
-- FIXLATER
-- Skin.ClubFinderFocusDropdownTemplate(Frame.ClubFocusDropdown)
-- Skin.UIDropDownMenuTemplate(Frame.LookingForDropdown)
-- Skin.UIDropDownMenuTemplate(Frame.LanguageDropdown)

-- BlizzWTF: RecruitmentMessageFrame.RecruitmentMessageInput already has a border via InputScrollFrameTemplate
local EditBox = Frame.RecruitmentMessageFrame
Expand Down Expand Up @@ -369,13 +372,16 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
Skin.UIPanelButtonTemplate(Frame.RequestJoin)
end
function Skin.ClubFinderFocusDropdownTemplate(Frame)
Skin.UIDropDownMenuTemplate(Frame)
-- FIXLATER
-- Skin.UIDropDownMenuTemplate(Frame)
end
function Skin.ClubFinderFilterDropdownTemplate(Frame)
Skin.UIDropDownMenuTemplate(Frame)
-- FIXLATER
-- Skin.UIDropDownMenuTemplate(Frame)
end
function Skin.ClubFinderCheckboxTemplate(CheckButton)
Skin.UICheckButtonTemplate(CheckButton) -- BlizzWTF: Doesn't use the template
-- -- FIXLATER
-- Skin.UICheckButtonTemplate(CheckButton) -- BlizzWTF: Doesn't use the template
end
function Skin.ClubFinderGuildCardsFrameTemplate(Frame)
Skin.ClubFinderGuildCardTemplate(Frame.FirstCard)
Expand Down Expand Up @@ -417,8 +423,9 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
end
function Skin.ClubFinderOptionsTemplate(Frame)
Skin.ClubFinderFilterDropdownTemplate(Frame.ClubFilterDropdown)
Skin.UIDropDownMenuTemplate(Frame.ClubSizeDropdown)
Skin.UIDropDownMenuTemplate(Frame.SortByDropdown)
-- FIXLATER
-- Skin.UIDropDownMenuTemplate(Frame.ClubSizeDropdown)
-- Skin.UIDropDownMenuTemplate(Frame.SortByDropdown)
Skin.ClubFinderRoleTemplate(Frame.TankRoleFrame)
Skin.ClubFinderRoleTemplate(Frame.HealerRoleFrame)
Skin.ClubFinderRoleTemplate(Frame.DpsRoleFrame)
Expand Down Expand Up @@ -619,7 +626,8 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
Skin.UIPanelCloseButton(Frame.CloseButton)
Skin.UIPanelButtonTemplate(Frame.RemoveButton)
Skin.UIPanelButtonTemplate(Frame.GroupInviteButton)
Skin.UIDropDownMenuTemplate(Frame.RankDropdown)
-- FIXLATER
-- Skin.UIDropDownMenuTemplate(Frame.RankDropdown)

Skin.FrameTypeFrame(Frame.NoteBackground)
Skin.FrameTypeFrame(Frame.OfficerNoteBackground)
Expand Down Expand Up @@ -698,6 +706,8 @@ do --[[ AddOns\Blizzard_Communities.xml ]]
end

function private.AddOns.Blizzard_Communities()
-- FIXLATER - disable for now
-- if private.isRetail then return end
----====####$$$$%%%%%$$$$####====----
-- CommunitiesList --
----====####$$$$%%%%%$$$$####====----
Expand Down Expand Up @@ -801,9 +811,10 @@ function private.AddOns.Blizzard_Communities()
Skin.ClubFinderCheckboxTemplate(CommunitiesSettingsDialog.MinIlvlOnly.Button)
Skin.InputBoxTemplate(CommunitiesSettingsDialog.MinIlvlOnly.EditBox)

Skin.ClubFinderFocusDropdownTemplate(CommunitiesSettingsDialog.ClubFocusDropdown)
Skin.UIDropDownMenuTemplate(CommunitiesSettingsDialog.LookingForDropdown)
Skin.UIDropDownMenuTemplate(CommunitiesSettingsDialog.LanguageDropdown)
-- FIXLATER
-- Skin.ClubFinderFocusDropdownTemplate(CommunitiesSettingsDialog.ClubFocusDropdown)
-- Skin.UIDropDownMenuTemplate(CommunitiesSettingsDialog.LookingForDropdown)
-- Skin.UIDropDownMenuTemplate(CommunitiesSettingsDialog.LanguageDropdown)

Skin.InputScrollFrameTemplate(CommunitiesSettingsDialog.Description)
else
Expand Down Expand Up @@ -834,8 +845,9 @@ function private.AddOns.Blizzard_Communities()

Skin.UIPanelButtonTemplate(CommunitiesTicketManagerDialog.LinkToChat)
Skin.UIPanelButtonTemplate(CommunitiesTicketManagerDialog.Copy)
Skin.UIDropDownMenuTemplate(CommunitiesTicketManagerDialog.ExpiresDropDownMenu)
Skin.UIDropDownMenuTemplate(CommunitiesTicketManagerDialog.UsesDropDownMenu)
-- FIXLATER
-- Skin.UIDropDownMenuTemplate(CommunitiesTicketManagerDialog.ExpiresDropDownMenu)
-- Skin.UIDropDownMenuTemplate(CommunitiesTicketManagerDialog.UsesDropDownMenu)
Skin.UIPanelButtonTemplate(CommunitiesTicketManagerDialog.GenerateLinkButton)
Skin.UIPanelSquareButton(CommunitiesTicketManagerDialog.MaximizeButton, "DOWN")
Skin.CommunitiesTicketManagerScrollFrameTemplate(CommunitiesTicketManagerDialog.InviteManager)
Expand Down
Loading

0 comments on commit 55978b8

Please sign in to comment.