Commit 295a4e68 authored by Merathilis's avatar Merathilis
Browse files

Merge branch 'master' into 'master'

update classic skins

See merge request Azilroka/AddOnSkins!75
parents 4b9fa4d6 579d84d1
......@@ -18,13 +18,10 @@ function AS:Blizzard_Character()
AS:StripTextures(_G.PaperDollFrame)
AS:SkinBackdropFrame(_G.CharacterFrame)
_G.CharacterFrame.Backdrop:SetPoint('TOPLEFT', 11, -12)
_G.CharacterFrame.Backdrop:SetPoint('BOTTOMRIGHT', -31, 76)
AS:CreateShadow(_G.CharacterFrame.Backdrop)
AS:SkinBackdropFrame(_G.CharacterModelFrame)
_G.CharacterModelFrame.Backdrop:SetPoint('TOPLEFT', -2, 4)
_G.CharacterModelFrame.Backdrop:SetPoint('BOTTOMRIGHT', 2, -80)
AS:CreateShadow(_G.CharacterModelFrame.Backdrop, true)
_G.CharacterFrame.Backdrop:SetPoint('BOTTOMRIGHT', -32, 76)
AS:CreateShadow(_G.CharacterFrame)
_G.CharacterFrame.Shadow:SetPoint('TOPLEFT', 8, -9)
_G.CharacterFrame.Shadow:SetPoint('BOTTOMRIGHT', -29, 73)
CharacterModelFrameRotateLeftButton:SetSize(16, 16)
CharacterModelFrameRotateRightButton:SetSize(16, 16)
......@@ -35,6 +32,9 @@ function AS:Blizzard_Character()
AS:Kill(_G.CharacterFramePortrait)
AS:StripTextures(_G.CharacterAttributesFrame)
AS:SkinBackdropFrame(_G.CharacterAttributesFrame)
_G.CharacterAttributesFrame.Backdrop:SetPoint('TOPLEFT', -2, 1)
_G.CharacterAttributesFrame.Backdrop:SetPoint('BOTTOMRIGHT', 2, -5)
AS:StripTextures(_G.PetPaperDollFrame)
AS:StripTextures(_G.PetAttributesFrame)
......@@ -245,11 +245,17 @@ function AS:Blizzard_Character()
-- Honor Frame
AS:StripTextures(HonorFrame)
AS:SkinStatusBar(HonorFrameProgressBar)
HonorFrameCurrentPVPTitle:SetParent(HonorFrameProgressBar)
HonorFrameCurrentPVPRank:SetParent(HonorFrameProgressBar)
HonorFrameCurrentPVPTitle:SetDrawLayer('OVERLAY')
HonorFrameCurrentPVPRank:SetDrawLayer('OVERLAY')
AS:SkinBackdropFrame(HonorFrame)
HonorFrame.Backdrop:SetPoint("TOPLEFT", 18, -105)
HonorFrame.Backdrop:SetPoint("BOTTOMRIGHT", -39, 83)
HonorFrame.Backdrop:SetFrameLevel(HonorFrame:GetFrameLevel())
AS:CreateBackdrop(HonorFrameProgressButton, "Transparent")
HonorFrameProgressBar:Width(325)
HonorFrameProgressBar:SetStatusBarTexture(AS.NormTex)
HonorFrameProgressBar:ClearAllPoints()
HonorFrameProgressBar:SetPoint("TOP", HonorFrame, "TOP", -10, -73)
end
function AS:Blizzard_DressUpFrame()
......
......@@ -295,8 +295,12 @@ function AS:Blizzard_GuildUI(event, addon)
AS:SkinButton(GuildMemberGroupInviteButton)
AS:SkinFrame(GuildMemberDetailFrame)
AS:StripTextures(GuildMemberNoteBackground)
AS:StripTextures(GuildMemberOfficerNoteBackground)
AS:SkinFrame(GuildMemberNoteBackground)
AS:SkinFrame(GuildMemberOfficerNoteBackground)
_G.GuildMOTDEditButton:CreateBackdrop('Default')
_G.GuildMOTDEditButton.Backdrop:SetPoint('TOPLEFT', -3, 3)
_G.GuildMOTDEditButton.Backdrop:SetPoint('BOTTOMRIGHT', 3, -2)
for i = 1, 4 do
AS:StripTextures(_G["GuildFrameColumnHeader"..i])
......
......@@ -120,6 +120,26 @@ function AS:Blizzard_Options(event, addon)
AS:UnregisterSkinEvent(addon, event)
end
local ReadyCheckFrame = _G.ReadyCheckFrame
_G.ReadyCheckFrameYesButton:SetParent(ReadyCheckFrame)
_G.ReadyCheckFrameNoButton:SetParent(ReadyCheckFrame)
_G.ReadyCheckFrameYesButton:ClearAllPoints()
_G.ReadyCheckFrameNoButton:ClearAllPoints()
_G.ReadyCheckFrameYesButton:Point('TOPRIGHT', ReadyCheckFrame, 'CENTER', -3, -5)
_G.ReadyCheckFrameNoButton:Point('TOPLEFT', ReadyCheckFrame, 'CENTER', 3, -5)
_G.ReadyCheckFrameText:SetParent(ReadyCheckFrame)
_G.ReadyCheckFrameText:ClearAllPoints()
_G.ReadyCheckFrameText:Point('TOP', 0, -15)
_G.ReadyCheckListenerFrame:SetAlpha(0)
ReadyCheckFrame:HookScript('OnShow', function(self)
-- bug fix, don't show it if player is initiator
if self.initiator and UnitIsUnit('player', self.initiator) then
self:Hide()
end
end)
if event == 'PLAYER_ENTERING_WORLD' then
-- Sytem / Interface Panel
......
......@@ -45,6 +45,7 @@ function AS:Blizzard_Others()
AS:SetTemplate(_G["GeneralDockManagerOverflowButtonList"])
AS:StripTextures(ReadyCheckFrame)
AS:SkinFrame(ReadyCheckFrame)
AS:SkinButton(ReadyCheckFrameYesButton)
AS:SkinButton(ReadyCheckFrameNoButton)
......@@ -147,6 +148,26 @@ function AS:Blizzard_Others()
end
end
end)
local BattlefieldFrame = _G.BattlefieldFrame
AS:SkinBackdropFrame(BattlefieldFrame)
BattlefieldFrame.Backdrop:SetPoint("TOPLEFT", 11, -12)
BattlefieldFrame.Backdrop:SetPoint("BOTTOMRIGHT", -32, 76)
AS:StripTextures(_G.BattlefieldListScrollFrame)
AS:SkinScrollBar(_G.BattlefieldListScrollFrameScrollBar)
_G.BattlefieldFrameZoneDescription:SetTextColor(1, 1, 1)
AS:SkinButton(_G.BattlefieldFrameCancelButton)
AS:SkinButton(_G.BattlefieldFrameJoinButton)
AS:SkinButton(_G.BattlefieldFrameGroupJoinButton)
_G.BattlefieldFrameGroupJoinButton:ClearAllPoints()
_G.BattlefieldFrameGroupJoinButton:SetPoint("RIGHT", _G.BattlefieldFrameJoinButton, "LEFT", -2, 0)
AS:SkinCloseButton(_G.BattlefieldFrameCloseButton)
end
AS:RegisterSkin('Blizzard_Others', AS.Blizzard_Others)
......@@ -40,7 +40,7 @@ function AS:Blizzard_TalentUI(event, addon)
icon:SetDrawLayer('ARTWORK')
rank:SetDrawLayer('OVERLAY')
--rank:SetFont(AS.Font, 12, 'OUTLINE') -- easier to read
rank:SetFont(AS.Font, 12, 'OUTLINE') -- easier to read
end
end
......
......@@ -170,8 +170,16 @@ function AS:Blizzard_TradeSkill(event, addon)
_G.TradeSkillFramePortrait:SetAlpha(0)
_G.TradeSkillFrame.Backdrop:SetPoint('TOPLEFT', 11, -12)
_G.TradeSkillFrame.Backdrop:SetPoint('BOTTOMRIGHT', -32, 76)
AS:CreateShadow(_G.TradeSkillFrame)
_G.TradeSkillFrame.Shadow:SetPoint('TOPLEFT', 8, -9)
_G.TradeSkillFrame.Shadow:SetPoint('BOTTOMRIGHT', -29, 73)
AS:SkinStatusBar(_G.TradeSkillRankFrame)
AS:StripTextures(_G.TradeSkillRankFrame)
AS:CreateBackdrop(_G.TradeSkillRankFrame, "Transparent")
_G.TradeSkillRankFrame:Size(322, 16)
_G.TradeSkillRankFrame:ClearAllPoints()
_G.TradeSkillRankFrame:Point('TOP', -10, -45)
_G.TradeSkillRankFrame:SetStatusBarTexture(AS.NormTex)
AS:SkinCloseButton(_G.TradeSkillFrameCloseButton)
......@@ -191,8 +199,12 @@ function AS:Blizzard_TradeSkill(event, addon)
TradeSkillCollapseAllButton:GetDisabledTexture():SetDesaturated(true)
AS:SkinDropDownBox(_G.TradeSkillInvSlotDropDown)
_G.TradeSkillInvSlotDropDown:ClearAllPoints()
_G.TradeSkillInvSlotDropDown:SetPoint('TOPRIGHT', TradeSkillFrame, 'TOPRIGHT', -32, -64)
AS:SkinDropDownBox(_G.TradeSkillSubClassDropDown)
_G.TradeSkillSubClassDropDown:ClearAllPoints()
_G.TradeSkillSubClassDropDown:SetPoint('RIGHT', _G.TradeSkillInvSlotDropDown, 'RIGHT', -130, 0)
_G.TradeSkillFrameTitleText:ClearAllPoints()
_G.TradeSkillFrameTitleText:SetPoint('TOP', _G.TradeSkillFrame, 'TOP', 0, -18)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment