diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-BG-2.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-BG-2.blp new file mode 100644 index 0000000..9bf1b37 Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-BG-2.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-BG.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-BG.blp index a81286f..1ec2399 100644 Binary files a/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-BG.blp and b/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-BG.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-LEFT-2.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-LEFT-2.blp new file mode 100644 index 0000000..c4457f5 Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-LEFT-2.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-RIGHT-2.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-RIGHT-2.blp new file mode 100644 index 0000000..838eaed Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-RIGHT-2.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-RIGHT.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-RIGHT.blp index fbd1737..b04bc6d 100644 Binary files a/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-RIGHT.blp and b/Interface/AddOns/SVUI/assets/artwork/Template/Alert/ALERT-RIGHT.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Alert/Thumbs.db b/Interface/AddOns/SVUI/assets/artwork/Template/Alert/Thumbs.db new file mode 100644 index 0000000..240138c Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Template/Alert/Thumbs.db differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/PLAYER-AFK.blp b/Interface/AddOns/SVUI/assets/artwork/Template/PLAYER-AFK.blp index 452a517..a4abb33 100644 Binary files a/Interface/AddOns/SVUI/assets/artwork/Template/PLAYER-AFK.blp and b/Interface/AddOns/SVUI/assets/artwork/Template/PLAYER-AFK.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Thumbs.db b/Interface/AddOns/SVUI/assets/artwork/Template/Thumbs.db new file mode 100644 index 0000000..c87aa4e Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Template/Thumbs.db differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Unitframe/FOLLOWER-RING.blp b/Interface/AddOns/SVUI/assets/artwork/Unitframe/FOLLOWER-RING.blp new file mode 100644 index 0000000..9d7fab1 Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Unitframe/FOLLOWER-RING.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Unitframe/SMALL-UNIT-RING.blp b/Interface/AddOns/SVUI/assets/artwork/Unitframe/SMALL-UNIT-RING.blp new file mode 100644 index 0000000..4d52743 Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Unitframe/SMALL-UNIT-RING.blp differ diff --git a/Interface/AddOns/SVUI/framework/api/api_layout.lua b/Interface/AddOns/SVUI/framework/api/api_layout.lua index 267f281..a37486e 100644 --- a/Interface/AddOns/SVUI/framework/api/api_layout.lua +++ b/Interface/AddOns/SVUI/framework/api/api_layout.lua @@ -154,14 +154,17 @@ local function RemoveTextures(self, option) region.Show = region.Hide end region:Hide() + if(region.SetAtlas) then + region.SetAtlas = SV.fubar + end elseif(type(option) == "string" and ((layer == option) or (texture ~= option))) then region:SetTexture(0,0,0,0) end else region:SetTexture(0,0,0,0) - end + end end - end + end end --[[ ########################################################## diff --git a/Interface/AddOns/SVUI/framework/api/api_templates.lua b/Interface/AddOns/SVUI/framework/api/api_templates.lua index 49ae711..8db352e 100644 --- a/Interface/AddOns/SVUI/framework/api/api_templates.lua +++ b/Interface/AddOns/SVUI/framework/api/api_templates.lua @@ -375,7 +375,9 @@ local function CreatePanelTemplate(frame, templateName, underlay, noupdate, padd hooksecurefunc(frame.Panel, "SetBackdropBorderColor", HookPanelBorderColor) hooksecurefunc(frame, "SetBackdropBorderColor", HookBackdropBorderColor) if(underlay) then - hooksecurefunc(frame, "SetBackdrop", HookBackdrop) + frame:SetBackdrop(nil) + frame.SetBackdrop = frame.Panel.SetBackdrop + --hooksecurefunc(frame, "SetBackdrop", HookBackdrop) hooksecurefunc(frame, "SetBackdropColor", HookBackdropColor) end frame.BackdropNeedsUpdate = true @@ -531,7 +533,7 @@ local function SetBasicPanel(self, topX, topY, bottomX, bottomY, hasShadow) bottom = 1, }, }) - self.Panel:SetBackdropColor(0,0,0,0.65) + self.Panel:SetBackdropColor(0,0,0,0.5) self.Panel:SetBackdropBorderColor(0,0,0) end @@ -546,9 +548,10 @@ local function SetBasicPanel(self, topX, topY, bottomX, bottomY, hasShadow) if(adjustment < 0) then adjustment = 0 end self.Panel:SetFrameLevel(adjustment) - hooksecurefunc(self, "SetFrameLevel", HookFrameLevel) - hooksecurefunc(self, "SetBackdrop", HookBackdrop) + + self:SetBackdrop(nil) + self.SetBackdrop = self.Panel.SetBackdrop hooksecurefunc(self, "SetBackdropColor", HookBackdropColor) hooksecurefunc(self, "SetBackdropBorderColor", HookBackdropBorderColor) end diff --git a/Interface/AddOns/SVUI/framework/widgets/widget_afk.lua b/Interface/AddOns/SVUI/framework/widgets/widget_afk.lua index 204d16b..2b46842 100644 --- a/Interface/AddOns/SVUI/framework/widgets/widget_afk.lua +++ b/Interface/AddOns/SVUI/framework/widgets/widget_afk.lua @@ -81,9 +81,9 @@ function SV.AFK:Initialize() self.Model:SetFacing(6) local splash = self.Model:CreateTexture(nil, "OVERLAY") - splash:Size(256,256) + splash:Size(512,256) splash:SetTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Template\\PLAYER-AFK") - splash:Point("TOPRIGHT", self, "TOPRIGHT", 0, -64) + splash:Point("BOTTOMRIGHT", self.Model, "LEFT", 0, 0) self:Hide() if(SV.db.general.afk) then diff --git a/Interface/AddOns/SVUI/system/alerts.lua b/Interface/AddOns/SVUI/system/alerts.lua index bd87485..d43484e 100644 --- a/Interface/AddOns/SVUI/system/alerts.lua +++ b/Interface/AddOns/SVUI/system/alerts.lua @@ -189,6 +189,22 @@ SV.SystemAlert["RESETMOVERS_CHECK"] = { timeout = 0, whileDead = 1 }; +SV.SystemAlert["RESETMENTALO_CHECK"] = { + text = L["Are you sure you want to all SVUI frames to their original positions?"], + button1 = ACCEPT, + button2 = CANCEL, + OnAccept = function(a)SV.Mentalo:Reset()end, + timeout = 0, + whileDead = 1 +}; +SV.SystemAlert["RESETBLIZZARD_CHECK"] = { + text = L["Are you sure you want to all draggable Blizzard frames to their original positions?"], + button1 = ACCEPT, + button2 = CANCEL, + OnAccept = function(a)SV.Mentalo:Reset("Blizzard")end, + timeout = 0, + whileDead = 1 +}; SV.SystemAlert["RESET_UI_CHECK"] = { text = L["I will attempt to preserve some of your basic settings but no promises. This will clean out everything else. Are you sure you want to reset everything?"], button1 = ACCEPT, diff --git a/Interface/AddOns/SVUI/system/media.lua b/Interface/AddOns/SVUI/system/media.lua index a2471c1..2dfb8e5 100644 --- a/Interface/AddOns/SVUI/system/media.lua +++ b/Interface/AddOns/SVUI/system/media.lua @@ -156,7 +156,7 @@ do ["lightgrey"] = {0.32, 0.35, 0.38, 1}, ["highlight"] = {0.1, 0.8, 0.8, 1}, ["green"] = {0.25, 0.9, 0.08, 1}, - ["blue"] = {0.08, 0.25, 0.9, 1}, + ["blue"] = {0.08, 0.25, 0.82, 1}, ["tan"] = {0.4, 0.32, 0.23, 1}, ["red"] = {0.9, 0.08, 0.08, 1}, ["yellow"] = {1, 1, 0, 1}, diff --git a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua index 4546934..facc34f 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua +++ b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua @@ -165,7 +165,7 @@ SV.Options.args.primary = { type = "execute", name = L["Reset SVUI Anchors"], desc = L["Reset all SVUI frames to their original positions."], - func = function() SV.Mentalo:Reset() end + func = function() SV:StaticPopup_Show("RESETMENTALO_CHECK") end }, ResetDraggables = { order = 4, @@ -173,7 +173,7 @@ SV.Options.args.primary = { type = "execute", name = L["Reset Blizzard Anchors"], desc = L["Reset all draggable Blizzard frames to their original positions."], - func = function() SV.Mentalo:Reset("Blizzard") end + func = function() SV:StaticPopup_Show("RESETBLIZZARD_CHECK") end }, toggleKeybind = { order = 5, diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/alert.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/alert.lua index 33efc4b..85f59d4 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/alert.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/alert.lua @@ -28,9 +28,97 @@ HELPERS ########################################################## ]]-- local AlphaBlock = function() return end + +local function StyleLootFrame(frame) + frame:SetAlpha(1) + frame.SetAlpha = AlphaBlock + frame.Background:Die() + + frame.Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + frame.IconBorder:Die() + + frame.Icon.Underlay = CreateFrame("Frame", nil, frame) + frame.Icon.Underlay:WrapOuter(frame.Icon) + frame.Icon.Underlay:SetSlotTemplate(true, 2, 0, 0) + frame.Icon:SetParent(frame.Icon.Underlay) + + frame.Underlay = CreateFrame("Frame", nil, frame) + frame.Underlay:SetPoint("TOPLEFT", frame.Icon.Underlay, "TOPLEFT", -4, 4) + frame.Underlay:SetPoint("BOTTOMRIGHT", frame.Icon.Underlay, "BOTTOMRIGHT", 180, -4) + + PLUGIN:ApplyPopupStyle(frame.Underlay) +end +-- /script GarrisonMissionAlertFrame:Show() +local function StyleGarrisonMissionAlertFrame() + local frameName = "GarrisonMissionAlertFrame" + local frame = _G[frameName] + if(frame and (not frame.Panel)) then + frame:SetAlpha(1) + frame.SetAlpha = AlphaBlock + frame.AlphaHooked = true + frame:DisableDrawLayer("BACKGROUND") + PLUGIN:ApplyAlertStyle(frame) + frame:ChangeAlertColor('blue') + + frame.IconBG:SetTexture('') + + frame.Title:FontManager(nil, 12) + frame.Title:SetTextColor(1, 1, 1) + + _G[frameName.."Glow"]:Die() + _G[frameName.."Shine"]:Die() + end +end +-- /script GarrisonBuildingAlertFrame:Show() +local function StyleGarrisonBuildingAlertFrame() + local frameName = "GarrisonBuildingAlertFrame" + local frame = _G[frameName] + if(frame and (not frame.Panel)) then + frame:SetAlpha(1) + frame.SetAlpha = AlphaBlock + frame.AlphaHooked = true + frame:DisableDrawLayer("BACKGROUND") + PLUGIN:ApplyPopupStyle(frame,0.75,0.42,0) + + frame.Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + + frame.Title:FontManager(nil, 12) + frame.Title:SetTextColor(1, 1, 1) + + _G[frameName.."Glow"]:Die() + _G[frameName.."Shine"]:Die() + end +end +-- /script GarrisonFollowerAlertFrame:Show() +local function StyleGarrisonFollowerAlertFrame() + local frameName = "GarrisonFollowerAlertFrame" + local frame = _G[frameName] + if(frame and (not frame.Panel)) then + frame:SetAlpha(1) + frame.SetAlpha = AlphaBlock + frame.AlphaHooked = true + frame:DisableDrawLayer("BACKGROUND") + PLUGIN:ApplyPopupStyle(frame) + + frame.FollowerBG:SetTexCoord(0.1, 0.9, 0.1, 0.9) + + frame.Title:FontManager(nil, 12) + frame.Title:SetTextColor(1, 1, 1) + + _G[frameName.."Glow"]:Die() + _G[frameName.."Shine"]:Die() + end + + if(frame.PortraitFrame) then + --frame.PortraitFrame:SetPanelTemplate('Blackout') + frame.PortraitFrame.PortraitRing:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Unitframe\FOLLOWER-RING]]) + frame.PortraitFrame.PortraitRingQuality:SetTexture('') + frame.PortraitFrame.LevelBorder:SetTexture('') + end +end --[[ ########################################################## -ALERTFRAME PLUGINR +ALERTFRAME STYLES ########################################################## ]]-- local function AlertStyle() @@ -53,36 +141,53 @@ local function AlertStyle() end end + StyleGarrisonMissionAlertFrame() + StyleGarrisonBuildingAlertFrame() + StyleGarrisonFollowerAlertFrame() + + hooksecurefunc("GarrisonMissionAlertFrame_ShowAlert", function() + GarrisonMissionAlertFrame:DisableDrawLayer("BACKGROUND") + end) + + hooksecurefunc("GarrisonBuildingAlertFrame_ShowAlert", function() + GarrisonBuildingAlertFrame:DisableDrawLayer("BACKGROUND") + end) + + hooksecurefunc("GarrisonFollowerAlertFrame_ShowAlert", function() + GarrisonFollowerAlertFrame:DisableDrawLayer("BACKGROUND") + end) + hooksecurefunc("AlertFrame_SetAchievementAnchors", function() - for i = 1, MAX_ACHIEVEMENT_ALERTS do - local frame = _G["AchievementAlertFrame"..i] - if frame then + for i = 1, MAX_ACHIEVEMENT_ALERTS do + local frameName = "AchievementAlertFrame"..i + local frame = _G[frameName] + if(frame and (not frame.Panel)) then frame:SetAlpha(1) frame.SetAlpha = AlphaBlock - if not frame.Panel then - frame:SetBasicPanel() - frame.Panel:Point("TOPLEFT", _G[frame:GetName().."Background"], "TOPLEFT", -2, -6) - frame.Panel:Point("BOTTOMRIGHT", _G[frame:GetName().."Background"], "BOTTOMRIGHT", -2, 6) - end - _G["AchievementAlertFrame"..i.."Background"]:SetTexture(0,0,0,0) - _G["AchievementAlertFrame"..i.."OldAchievement"]:Die() - _G["AchievementAlertFrame"..i.."Glow"]:Die() - _G["AchievementAlertFrame"..i.."Shine"]:Die() - _G["AchievementAlertFrame"..i.."GuildBanner"]:Die() - _G["AchievementAlertFrame"..i.."GuildBorder"]:Die() - _G["AchievementAlertFrame"..i.."Unlocked"]:FontManager(nil, 12) - _G["AchievementAlertFrame"..i.."Unlocked"]:SetTextColor(1, 1, 1) - _G["AchievementAlertFrame"..i.."Name"]:FontManager(nil, 12) - _G["AchievementAlertFrame"..i.."IconTexture"]:SetTexCoord(0.1, 0.9, 0.1, 0.9) - _G["AchievementAlertFrame"..i.."IconOverlay"]:Die() - _G["AchievementAlertFrame"..i.."IconTexture"]:ClearAllPoints() - _G["AchievementAlertFrame"..i.."IconTexture"]:Point("LEFT", frame, 7, 0) - if not _G["AchievementAlertFrame"..i.."IconTexture"].b then - _G["AchievementAlertFrame"..i.."IconTexture"].b = CreateFrame("Frame", nil, _G["AchievementAlertFrame"..i]) - _G["AchievementAlertFrame"..i.."IconTexture"].b:SetFixedPanelTemplate("Default") - _G["AchievementAlertFrame"..i.."IconTexture"].b:WrapOuter(_G["AchievementAlertFrame"..i.."IconTexture"]) - _G["AchievementAlertFrame"..i.."IconTexture"]:SetParent(_G["AchievementAlertFrame"..i.."IconTexture"].b) - end + frame.AlphaHooked = true + PLUGIN:ApplyAlertStyle(frame) + frame:ChangeAlertColor('blue') + + _G[frameName.."Background"]:SetTexture(0,0,0,0) + _G[frameName.."Unlocked"]:FontManager(nil, 12) + _G[frameName.."Unlocked"]:SetTextColor(1, 1, 1) + _G[frameName.."Name"]:FontManager(nil, 12) + + local icon = _G[frameName.."IconTexture"]; + icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + icon:ClearAllPoints() + icon:Point("LEFT", frame, 7, 0) + icon.Underlay = CreateFrame("Frame", nil, frame) + icon.Underlay:WrapOuter(icon) + icon.Underlay:SetSlotTemplate() + icon:SetParent(icon.Underlay) + + _G[frameName.."IconOverlay"]:Die() + _G[frameName.."OldAchievement"]:Die() + _G[frameName.."Glow"]:Die() + _G[frameName.."Shine"]:Die() + _G[frameName.."GuildBanner"]:Die() + _G[frameName.."GuildBorder"]:Die() end end end) @@ -90,40 +195,32 @@ local function AlertStyle() hooksecurefunc("AlertFrame_SetDungeonCompletionAnchors", function() for i = 1, DUNGEON_COMPLETION_MAX_REWARDS do local frame = _G["DungeonCompletionAlertFrame"..i] - if frame then + if(frame and (not frame.Panel)) then frame:SetAlpha(1) - - if(not frame.AlphaHooked) then - frame.SetAlpha = AlphaBlock - frame.AlphaHooked = true - end - - if(not frame.Panel) then - frame:SetBasicPanel() - frame.Panel:Point("TOPLEFT", frame, "TOPLEFT", -2, -6) - frame.Panel:Point("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -2, 6) - end - - frame.shine:Die() - frame.glowFrame:Die() - frame.glowFrame.glow:Die() + frame.SetAlpha = AlphaBlock + frame.AlphaHooked = true + + PLUGIN:ApplyAlertStyle(frame) + frame:ChangeAlertColor('blue') + + frame.dungeonTexture:SetTexCoord(0.1, 0.9, 0.1, 0.9) + frame.dungeonTexture:SetDrawLayer("OVERLAY") + frame.dungeonTexture:ClearAllPoints() + frame.dungeonTexture:Point("LEFT", frame, 7, 0) + frame.dungeonTexture.Underlay = CreateFrame("Frame", nil, frame) + frame.dungeonTexture.Underlay:WrapOuter(frame.dungeonTexture) + frame.dungeonTexture.Underlay:SetSlotTemplate() + frame.dungeonTexture:SetParent(frame.dungeonTexture.Underlay) + + -- frame.Shine:Die() + -- frame.GlowFrame:Die() + -- frame.GlowFrame.Glow:Die() frame.raidArt:Die() frame.dungeonArt1:Die() frame.dungeonArt2:Die() frame.dungeonArt3:Die() frame.dungeonArt4:Die() frame.heroicIcon:Die() - frame.dungeonTexture:SetTexCoord(0.1, 0.9, 0.1, 0.9) - frame.dungeonTexture:SetDrawLayer("OVERLAY") - frame.dungeonTexture:ClearAllPoints() - frame.dungeonTexture:Point("LEFT", frame, 7, 0) - - if not frame.dungeonTexture.b then - frame.dungeonTexture.b = CreateFrame("Frame", nil, frame) - frame.dungeonTexture.b:SetFixedPanelTemplate("Default") - frame.dungeonTexture.b:WrapOuter(frame.dungeonTexture) - frame.dungeonTexture:SetParent(frame.dungeonTexture.b) - end end end end) @@ -179,9 +276,9 @@ local function AlertStyle() if j:GetTexture() == "Interface\\Challenges\\challenges-main" then j:Die() end end end - ChallengeModeAlertFrame1Shine:Die() - ChallengeModeAlertFrame1GlowFrame:Die() - ChallengeModeAlertFrame1GlowFrame.glow:Die() + -- ChallengeModeAlertFrame1Shine:Die() + -- ChallengeModeAlertFrame1GlowFrame:Die() + -- ChallengeModeAlertFrame1GlowFrame.Glow:Die() ChallengeModeAlertFrame1Border:Die() ChallengeModeAlertFrame1DungeonTexture:SetTexCoord(0.1, 0.9, 0.1, 0.9) ChallengeModeAlertFrame1DungeonTexture:ClearAllPoints() @@ -211,9 +308,9 @@ local function AlertStyle() if j:GetTexture() == "Interface\\Scenarios\\ScenariosParts" then j:Die() end end end - ScenarioAlertFrame1Shine:Die() - ScenarioAlertFrame1GlowFrame:Die() - ScenarioAlertFrame1GlowFrame.glow:Die() + -- ScenarioAlertFrame1Shine:Die() + -- ScenarioAlertFrame1GlowFrame:Die() + -- ScenarioAlertFrame1GlowFrame.Glow:Die() ScenarioAlertFrame1DungeonTexture:SetTexCoord(0.1, 0.9, 0.1, 0.9) ScenarioAlertFrame1DungeonTexture:ClearAllPoints() ScenarioAlertFrame1DungeonTexture:Point("LEFT", frame.Panel, 9, 0) @@ -228,30 +325,33 @@ local function AlertStyle() hooksecurefunc("AlertFrame_SetCriteriaAnchors", function() for i = 1, MAX_ACHIEVEMENT_ALERTS do - local frame = _G["CriteriaAlertFrame"..i] - if frame then + local frameName = "CriteriaAlertFrame"..i + local frame = _G[frameName] + if(frame and (not frame.Panel)) then frame:SetAlpha(1) frame.SetAlpha = AlphaBlock - if not frame.Panel then - frame:SetBasicPanel() - frame.Panel:Point("TOPLEFT", frame, "TOPLEFT", -2, -6) - frame.Panel:Point("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -2, 6) - end - _G["CriteriaAlertFrame"..i.."Unlocked"]:SetTextColor(1, 1, 1) - _G["CriteriaAlertFrame"..i.."Name"]:SetTextColor(1, 1, 0) - _G["CriteriaAlertFrame"..i.."Background"]:Die() - _G["CriteriaAlertFrame"..i.."Glow"]:Die() - _G["CriteriaAlertFrame"..i.."Shine"]:Die() - _G["CriteriaAlertFrame"..i.."IconBling"]:Die() - _G["CriteriaAlertFrame"..i.."IconOverlay"]:Die() - if not _G["CriteriaAlertFrame"..i.."IconTexture"].b then - _G["CriteriaAlertFrame"..i.."IconTexture"].b = CreateFrame("Frame", nil, frame) - _G["CriteriaAlertFrame"..i.."IconTexture"].b:SetFixedPanelTemplate("Default") - _G["CriteriaAlertFrame"..i.."IconTexture"].b:Point("TOPLEFT", _G["CriteriaAlertFrame"..i.."IconTexture"], "TOPLEFT", -3, 3) - _G["CriteriaAlertFrame"..i.."IconTexture"].b:Point("BOTTOMRIGHT", _G["CriteriaAlertFrame"..i.."IconTexture"], "BOTTOMRIGHT", 3, -2) - _G["CriteriaAlertFrame"..i.."IconTexture"]:SetParent(_G["CriteriaAlertFrame"..i.."IconTexture"].b) - end - _G["CriteriaAlertFrame"..i.."IconTexture"]:SetTexCoord(0.1, 0.9, 0.1, 0.9) + frame.AlphaHooked = true + PLUGIN:ApplyAlertStyle(frame) + frame:ChangeAlertColor('blue') + + _G[frameName.."Background"]:SetTexture(0,0,0,0) + _G[frameName.."Unlocked"]:FontManager(nil, 12) + _G[frameName.."Unlocked"]:SetTextColor(1, 1, 1) + _G[frameName.."Name"]:FontManager(nil, 12) + + local icon = _G[frameName.."IconTexture"]; + icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + icon:ClearAllPoints() + icon:Point("LEFT", frame, 7, 0) + icon.Underlay = CreateFrame("Frame", nil, frame) + icon.Underlay:WrapOuter(icon) + icon.Underlay:SetSlotTemplate() + icon:SetParent(icon.Underlay) + + _G[frameName.."IconOverlay"]:Die() + _G[frameName.."Glow"]:Die() + _G[frameName.."Shine"]:Die() + _G[frameName.."IconBling"]:Die() end end end) @@ -259,25 +359,19 @@ local function AlertStyle() hooksecurefunc("AlertFrame_SetLootWonAnchors", function() for i = 1, #LOOT_WON_ALERT_FRAMES do local frame = LOOT_WON_ALERT_FRAMES[i] - if frame then + if(frame and (not frame.Panel)) then frame:SetAlpha(1) frame.SetAlpha = AlphaBlock + PLUGIN:ApplyPopupStyle(frame) frame.Background:Die() frame.Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) frame.IconBorder:Die() - frame.glow:Die() - frame.shine:Die() - if not frame.Icon.b then - frame.Icon.b = CreateFrame("Frame", nil, frame) - frame.Icon.b:SetPanelTemplate("Transparent") - frame.Icon.b:WrapOuter(frame.Icon) - frame.Icon:SetParent(frame.Icon.b) - end - if not frame.Panel then - frame:SetBasicPanel() - frame.Panel:SetPoint("TOPLEFT", frame.Icon.b, "TOPLEFT", -4, 4) - frame.Panel:SetPoint("BOTTOMRIGHT", frame.Icon.b, "BOTTOMRIGHT", 180, -4) - end + -- frame.Glow:Die() + -- frame.Shine:Die() + frame.Icon.Underlay = CreateFrame("Frame", nil, frame) + frame.Icon.Underlay:WrapOuter(frame.Icon) + frame.Icon.Underlay:SetSlotTemplate() + frame.Icon:SetParent(frame.Icon.Underlay) end end end) @@ -285,56 +379,31 @@ local function AlertStyle() hooksecurefunc("AlertFrame_SetMoneyWonAnchors", function() for i = 1, #MONEY_WON_ALERT_FRAMES do local frame = MONEY_WON_ALERT_FRAMES[i] - if frame then + if(frame and (not frame.Panel)) then frame:SetAlpha(1) frame.SetAlpha = AlphaBlock + PLUGIN:ApplyPopupStyle(frame) frame.Background:Die() frame.Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) frame.IconBorder:Die() - if not frame.Icon.b then - frame.Icon.b = CreateFrame("Frame", nil, frame) - frame.Icon.b:SetFixedPanelTemplate("Default") - frame.Icon.b:WrapOuter(frame.Icon) - frame.Icon:SetParent(frame.Icon.b) - end - if not frame.Panel then - frame:SetBasicPanel() - frame.Panel:SetPoint("TOPLEFT", frame.Icon.b, "TOPLEFT", -4, 4) - frame.Panel:SetPoint("BOTTOMRIGHT", frame.Icon.b, "BOTTOMRIGHT", 180, -4) - end - end + -- frame.Glow:Die() + -- frame.Shine:Die() + frame.Icon.Underlay = CreateFrame("Frame", nil, frame) + frame.Icon.Underlay:WrapOuter(frame.Icon) + frame.Icon.Underlay:SetSlotTemplate() + frame.Icon:SetParent(frame.Icon.Underlay) + end end end) - local frame = BonusRollMoneyWonFrame; - frame:SetAlpha(1) - frame.SetAlpha = AlphaBlock - frame.Background:Die() - frame.Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) - frame.IconBorder:Die() - frame.Icon.b = CreateFrame("Frame", nil, frame) - frame.Icon.b:SetFixedPanelTemplate("Default") - frame.Icon.b:WrapOuter(frame.Icon) - frame.Icon:SetParent(frame.Icon.b) - frame:SetBasicPanel() - frame.Panel:SetPoint("TOPLEFT", frame.Icon.b, "TOPLEFT", -4, 4) - frame.Panel:SetPoint("BOTTOMRIGHT", frame.Icon.b, "BOTTOMRIGHT", 180, -4) - - local frame = BonusRollLootWonFrame; - frame:SetAlpha(1) - frame.SetAlpha = AlphaBlock - frame.Background:Die() - frame.Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) - frame.IconBorder:Die() - frame.glow:Die() - frame.shine:Die() - frame.Icon.b = CreateFrame("Frame", nil, frame) - frame.Icon.b:SetFixedPanelTemplate("Default") - frame.Icon.b:WrapOuter(frame.Icon) - frame.Icon:SetParent(frame.Icon.b) - frame:SetBasicPanel() - frame.Panel:SetPoint("TOPLEFT", frame.Icon.b, "TOPLEFT", -4, 4) - frame.Panel:SetPoint("BOTTOMRIGHT", frame.Icon.b, "BOTTOMRIGHT", 180, -4) + hooksecurefunc("LootWonAlertFrame_SetUp", function(self) + if(self.BGAtlas) then + self.BGAtlas:Hide(); + end + end) + + StyleLootFrame(BonusRollMoneyWonFrame) + StyleLootFrame(BonusRollLootWonFrame) end --[[ ########################################################## diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/auctionhouse.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/auctionhouse.lua index d66799f..6361666 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/auctionhouse.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/auctionhouse.lua @@ -116,7 +116,7 @@ local function AuctionStyle() SideDressUpFrame.SetPoint = SV.fubar SideDressUpModel:RemoveTextures(true) SideDressUpModel:SetAllPoints(SideDressUpFrame) - SideDressUpModel:SetFixedPanelTemplate("Model") + SideDressUpModel:SetFixedPanelTemplate("ModelBorder") SideDressUpModelResetButton:SetButtonTemplate() SideDressUpModelResetButton:SetPoint("BOTTOM", SideDressUpModel, "BOTTOM", 0, 20) PLUGIN:ApplyCloseButtonStyle(SideDressUpModelCloseButton) @@ -232,24 +232,21 @@ local function AuctionStyle() if(buttonItem) then buttonItem:RemoveTextures() - buttonItem:SetSlotTemplate(true, 2, 0, 0) + buttonItem:SetSlotTemplate(false, 2, 0, 0) + end + + if(buttonTex) then buttonTex:SetParent(buttonItem.Panel) buttonTex:FillInner(buttonItem.Panel, 2, 2) - buttonItem:HookScript("OnUpdate", function() - buttonItem:GetNormalTexture():Die() - end) - - if(buttonTex) then - buttonTex:SetTexCoord(0.1, 0.9, 0.1, 0.9) - end - - local highLight = button:GetHighlightTexture() - _G["BrowseButton"..h.."Highlight"] = highLight - highLight:ClearAllPoints() - highLight:Point("TOPLEFT", buttonItem, "TOPRIGHT", 2, -2) - highLight:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -2, 7) - button:GetPushedTexture():SetAllPoints(highLight) - end + buttonTex:SetTexCoord(0.1, 0.9, 0.1, 0.9) + end + + local highLight = button:GetHighlightTexture() + highLight:ClearAllPoints() + highLight:Point("TOPLEFT", buttonItem, "TOPRIGHT", 2, -2) + highLight:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -2, 7) + button:GetPushedTexture():SetAllPoints(highLight) + _G["BrowseButton"..h.."Highlight"] = highLight end end diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/style_methods.lua b/Interface/AddOns/SVUI_StyleOMatic/components/style_methods.lua index 0764ac5..2f88483 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/style_methods.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/style_methods.lua @@ -636,8 +636,14 @@ end |__/ |__/|________/|________/|__/ |__/ |__/ ########################################################## --]] +local ChangeAlertColor = function(self, colorName) + local r,g,b = unpack(SV.Media.color[colorName]) + self.AlertPanel[1]:SetBackdropColor(r,g,b) + self.AlertPanel[2]:SetVertexColor(r,g,b) +end + function PLUGIN:ApplyAlertStyle(frame) - if(not frame or (frame and frame.StyleHooked)) then return end + if(not frame or (frame and frame.AlertPanel)) then return end local lvl = frame:GetFrameLevel() if lvl < 1 then lvl = 1 end @@ -660,8 +666,8 @@ function PLUGIN:ApplyAlertStyle(frame) local right = alertpanel:CreateTexture(nil, "BORDER") right:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\Alert\ALERT-RIGHT]]) right:SetVertexColor(0.8, 0.2, 0.2) - right:Point("TOPLEFT", alertpanel,"TOPRIGHT", -1, 0) - right:Point("BOTTOMLEFT", alertpanel, "BOTTOMRIGHT", -1, 0) + right:Point("TOPLEFT", alertpanel,"TOPRIGHT", 0, 0) + right:Point("BOTTOMLEFT", alertpanel, "BOTTOMRIGHT", 0, 0) right:Width(frame:GetHeight() * 2) --[[ TOP ]]-- @@ -678,7 +684,57 @@ function PLUGIN:ApplyAlertStyle(frame) bottom:Point("TOPRIGHT", alertpanel, "BOTTOMRIGHT", 0, 0) bottom:Width(frame:GetHeight() * 0.5) - frame.StyleHooked = true + frame.AlertPanel = {alertpanel, right} + frame.ChangeAlertColor = ChangeAlertColor +end + +function PLUGIN:ApplyPopupStyle(frame,r,g,b) + if(not frame or (frame and frame.AlertPanel)) then return end + r = r or 0.08 + g = g or 0.4 + b = b or 0 + local lvl = frame:GetFrameLevel() + if lvl < 1 then lvl = 1 end + local alertpanel = CreateFrame("Frame", nil, frame) + alertpanel:SetAllPoints(frame) + alertpanel:SetFrameLevel(lvl - 1) + alertpanel:SetBackdrop({ + bgFile = [[Interface\AddOns\SVUI\assets\artwork\Template\Alert\ALERT-BG-2]] + }) + alertpanel:SetBackdropColor(r,g,b) + + --[[ LEFT ]]-- + local left = alertpanel:CreateTexture(nil, "BORDER") + left:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\Alert\ALERT-LEFT-2]]) + left:SetVertexColor(r,g,b) + left:SetPoint("TOPRIGHT", alertpanel,"TOPLEFT", 0, 0) + left:SetPoint("BOTTOMRIGHT", alertpanel, "BOTTOMLEFT", 0, 0) + left:SetWidth(frame:GetHeight()) + + --[[ RIGHT ]]-- + local right = alertpanel:CreateTexture(nil, "BORDER") + right:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\Alert\ALERT-RIGHT-2]]) + right:SetVertexColor(r,g,b) + right:SetPoint("TOPLEFT", alertpanel,"TOPRIGHT", 0, 0) + right:SetPoint("BOTTOMLEFT", alertpanel, "BOTTOMRIGHT", 0, 0) + right:SetWidth(frame:GetHeight() * 2) + + --[[ TOP ]]-- + local top = alertpanel:CreateTexture(nil, "BORDER") + top:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\Alert\ALERT-TOP]]) + top:SetPoint("BOTTOMLEFT", alertpanel,"TOPLEFT", 0, 0) + top:SetPoint("BOTTOMRIGHT", alertpanel, "TOPRIGHT", 0, 0) + top:SetHeight(frame:GetHeight() * 0.5) + + --[[ BOTTOM ]]-- + local bottom = alertpanel:CreateTexture(nil, "BORDER") + bottom:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\Alert\ALERT-BOTTOM]]) + bottom:SetPoint("TOPLEFT", alertpanel,"BOTTOMLEFT", 0, 0) + bottom:SetPoint("TOPRIGHT", alertpanel, "BOTTOMRIGHT", 0, 0) + bottom:SetHeight(frame:GetHeight() * 0.5) + + frame.AlertPanel = {alertpanel, right} + frame.ChangeAlertColor = ChangeAlertColor end --[[ ##########################################################