diff --git a/SVUI_!Core/system/alerts.lua b/SVUI_!Core/system/alerts.lua index ad53f21..00a954c 100644 --- a/SVUI_!Core/system/alerts.lua +++ b/SVUI_!Core/system/alerts.lua @@ -841,6 +841,49 @@ local _hook_AlertFrame_SetGuildChallengeAnchors = function(self) frame:SetPoint(POSITION, self, ANCHOR_POINT, 0, YOFFSET) end end +-- +local _hook_AlertFrame_SetDigsiteCompleteToastFrameAnchors = function(self) + local frame = DigsiteCompleteToastFrame; + if(frame and frame:IsShown()) then + frame:ClearAllPoints() + frame:SetPoint(POSITION, self, ANCHOR_POINT, 0, YOFFSET) + end +end +local _hook_AlertFrame_SetGarrisonBuildingAlertFrameAnchors = function(self) + local frame = GarrisonBuildingAlertFrame; + if(frame and frame:IsShown()) then + frame:ClearAllPoints() + frame:SetPoint(POSITION, self, ANCHOR_POINT, 0, YOFFSET) + end +end +local _hook_AlertFrame_SetGarrisonMissionAlertFrameAnchors = function(self) + local frame = GarrisonMissionAlertFrame; + if(frame and frame:IsShown()) then + frame:ClearAllPoints() + frame:SetPoint(POSITION, self, ANCHOR_POINT, 0, YOFFSET) + end +end +local _hook_AlertFrame_SetGarrisonShipMissionAlertFrameAnchors = function(self) + local frame = GarrisonShipMissionAlertFrame; + if(frame and frame:IsShown()) then + frame:ClearAllPoints() + frame:SetPoint(POSITION, self, ANCHOR_POINT, 0, YOFFSET) + end +end +local _hook_AlertFrame_SetGarrisonFollowerAlertFrameAnchors = function(self) + local frame = GarrisonFollowerAlertFrame; + if(frame and frame:IsShown()) then + frame:ClearAllPoints() + frame:SetPoint(POSITION, self, ANCHOR_POINT, 0, YOFFSET) + end +end +local _hook_AlertFrame_SetGarrisonShipFollowerAlertFrameAnchors = function(self) + local frame = GarrisonShipFollowerAlertFrame; + if(frame and frame:IsShown()) then + frame:ClearAllPoints() + frame:SetPoint(POSITION, self, ANCHOR_POINT, 0, YOFFSET) + end +end local AlertFramePostMove_Hook = function(forced) local b, c = SVUI_AlertFrame_MOVE:GetCenter() @@ -1020,6 +1063,13 @@ local function LoadSystemAlerts() NewHook('AlertFrame_SetScenarioAnchors', _hook_AlertFrame_SetScenarioAnchors) NewHook('AlertFrame_SetGuildChallengeAnchors', _hook_AlertFrame_SetGuildChallengeAnchors) NewHook('AlertFrame_SetStorePurchaseAnchors', _hook_AlertFrame_SetStorePurchaseAnchors) + + NewHook('AlertFrame_SetDigsiteCompleteToastFrameAnchors', _hook_AlertFrame_SetDigsiteCompleteToastFrameAnchors) + NewHook('AlertFrame_SetGarrisonBuildingAlertFrameAnchors', _hook_AlertFrame_SetGarrisonBuildingAlertFrameAnchors) + NewHook('AlertFrame_SetGarrisonMissionAlertFrameAnchors', _hook_AlertFrame_SetGarrisonMissionAlertFrameAnchors) + NewHook('AlertFrame_SetGarrisonShipMissionAlertFrameAnchors', _hook_AlertFrame_SetGarrisonShipMissionAlertFrameAnchors) + NewHook('AlertFrame_SetGarrisonFollowerAlertFrameAnchors', _hook_AlertFrame_SetGarrisonFollowerAlertFrameAnchors) + NewHook('AlertFrame_SetGarrisonShipFollowerAlertFrameAnchors', _hook_AlertFrame_SetGarrisonShipFollowerAlertFrameAnchors) end SV.Events:On("LOAD_ALL_ESSENTIALS", LoadSystemAlerts); diff --git a/SVUI_!Core/system/api.lua b/SVUI_!Core/system/api.lua index 7e19f29..24248a0 100644 --- a/SVUI_!Core/system/api.lua +++ b/SVUI_!Core/system/api.lua @@ -414,9 +414,9 @@ local HookBackdrop = function(self,...) end end -local HookBackdropColor = function(self,...) +local HookBackdropColor = function(self,r,g,b) if(self.Panel) then - self.Panel:SetBackdropColor(...) + self.Panel:SetBackdropColor(r,g,b) end end @@ -824,7 +824,7 @@ function MOD:APPLY(frame, templateName, underlay, padding, xOffset, yOffset, def frame:SetBackdrop(nil) frame.SetBackdrop = panel.SetBackdrop --hooksecurefunc(frame, "SetBackdrop", HookBackdrop) - hooksecurefunc(frame, "SetBackdropColor", HookBackdropColor) + --hooksecurefunc(frame, "SetBackdropColor", HookBackdropColor) frame.UpdateBackdrop = HookCustomBackdrop_TypeA else frame.UpdateBackdrop = HookCustomBackdrop_TypeB diff --git a/SVUI_!Core/system/media.lua b/SVUI_!Core/system/media.lua index 768df22..7a3f9ea 100644 --- a/SVUI_!Core/system/media.lua +++ b/SVUI_!Core/system/media.lua @@ -195,7 +195,7 @@ do ["border"] = { ["default"] = {file = "SVUI Border", size = 1}, ["transparent"] = {file = "SVUI Border", size = 1}, - ["button"] = {file = "SVUI Border", size = 1}, + ["button"] = {file = "SVUI Border 2", size = 1}, ["pattern"] = {file = "SVUI Border", size = 1}, ["premium"] = {file = "SVUI Textured Border", size = 15}, ["model"] = {file = "SVUI Border", size = 1}, @@ -289,6 +289,7 @@ do ["gradient"] = { ["default"] = {"VERTICAL", 0.08, 0.08, 0.08, 0.22, 0.22, 0.22}, ["secondary"] = {"VERTICAL", 0.08, 0.08, 0.08, 0.22, 0.22, 0.22}, + ["button"] = {"VERTICAL", 0.08, 0.08, 0.08, 0.22, 0.22, 0.22}, ["special"] = {"VERTICAL", 0.33, 0.25, 0.13, 0.47, 0.39, 0.27}, ["specialdark"] = {"VERTICAL", 0.23, 0.15, 0.03, 0.33, 0.25, 0.13}, ["paper"] = {"VERTICAL", 0.53, 0.45, 0.33, 0.77, 0.72, 0.69}, @@ -389,7 +390,7 @@ do bgFile = [[Interface\AddOns\SVUI_!Core\assets\backgrounds\BUTTON]], tile = false, tileSize = 0, - edgeFile = [[Interface\AddOns\SVUI_!Core\assets\borders\DEFAULT]], + edgeFile = [[Interface\BUTTONS\WHITE8X8]], edgeSize = 1, insets = { diff --git a/SVUI_Skins/components/addons/Details.lua b/SVUI_Skins/components/addons/Details.lua index 3db6d18..a0ebe47 100644 --- a/SVUI_Skins/components/addons/Details.lua +++ b/SVUI_Skins/components/addons/Details.lua @@ -20,21 +20,21 @@ STYLE (IN DEVELOPMENT) ########################################################## ]]-- local function StyleDetails() - assert(DetailsBaseFrame1, "AddOn Not Loaded") - - local Loc = LibStub ("AceLocale-3.0"):GetLocale("Details") + assert(_G._detalhes, "AddOn Not Loaded"); for i=1, 10 do - local details_frame = _G['DetailsBaseFrame'..i]; - if(details_frame) then - DetailsBaseFrame1:RemoveTextures(); - DetailsBaseFrame1:SetStyle("Frame", "Transparent"); + local baseframe = _G['DetailsBaseFrame'..i]; + + if(baseframe) then + local bgframe = _G['Details_WindowFrame'..i]; + baseframe:RemoveTextures(); + if(bgframe) then + bgframe:RemoveTextures(); + bgframe:SetStyle("Frame", "Transparent"); + else + baseframe:SetStyle("Frame", "Transparent"); + end end - -- local up_frame = _G['DetailsUpFrameInstance'..i]; - -- if(up_frame) then - -- up_frame:RemoveTextures(); - -- up_frame:SetStyle("Frame", "Transparent"); - -- end end end --[[ diff --git a/SVUI_Skins/components/blizzard/alert.lua b/SVUI_Skins/components/blizzard/alert.lua index daf8e1b..0bdaf2f 100644 --- a/SVUI_Skins/components/blizzard/alert.lua +++ b/SVUI_Skins/components/blizzard/alert.lua @@ -426,6 +426,23 @@ local function AlertStyle() frame:HookScript("OnShow", _hook_DisableBackground) end + --Garrison Shipyard Mission + frameName = "GarrisonShipMissionAlertFrame" + frame = _G[frameName] + if(frame and (not frame.Panel)) then + frame:DisableDrawLayer("BACKGROUND") + + SV.API:Set("!_Alert", frame) + frame.MissionType:ClearAllPoints() + frame.MissionType:SetPoint("CENTER", frame.AlertPanel.icon, "CENTER", 0, 0) + frame.Title:SetTextColor(1, 1, 1) + + if(_G[frameName .. 'Glow']) then _G[frameName .. 'Glow']:Die() end + if(_G[frameName .. 'Shine']) then _G[frameName .. 'Shine']:Die() end + + frame:HookScript("OnShow", _hook_DisableBackground) + end + --Garrison Building frameName = "GarrisonBuildingAlertFrame" frame = _G[frameName] diff --git a/SVUI_Skins/components/blizzard/misc.lua b/SVUI_Skins/components/blizzard/misc.lua index 1807078..f2bb2d4 100644 --- a/SVUI_Skins/components/blizzard/misc.lua +++ b/SVUI_Skins/components/blizzard/misc.lua @@ -244,15 +244,17 @@ local function MiscStyles() SV.API:Set("CloseButton", GossipFrameCloseButton, GossipFrame.Panel) NPCFriendshipStatusBar:RemoveTextures() + NPCFriendshipStatusBar:SetFrameStrata('HIGH') + NPCFriendshipStatusBar:SetWidth(205) NPCFriendshipStatusBar:SetStatusBarTexture(SV.media.statusbar.default) NPCFriendshipStatusBar:SetStyle("Frame", "Bar") NPCFriendshipStatusBar:ClearAllPoints() - NPCFriendshipStatusBar:SetPoint("TOPLEFT", GossipFrame, "TOPLEFT", 58, -34) + NPCFriendshipStatusBar:SetPoint("TOPLEFT", GossipFrame, "TOPLEFT", 98, -38) NPCFriendshipStatusBar.icon:SetSize(32,32) NPCFriendshipStatusBar.icon:ClearAllPoints() - NPCFriendshipStatusBar.icon:SetPoint("RIGHT", NPCFriendshipStatusBar, "LEFT", 0, -2) + NPCFriendshipStatusBar.icon:SetPoint("LEFT", NPCFriendshipStatusBar, "RIGHT", 0, -2) SV.NPC:Register(GossipFrame, GossipFrameNpcNameText) hooksecurefunc("GossipTitleButton_OnClick", function() SV.NPC:PlayerTalksFirst() end) diff --git a/SVUI_Skins/components/blizzard/talents.lua b/SVUI_Skins/components/blizzard/talents.lua index 6baa5f1..0c8977e 100644 --- a/SVUI_Skins/components/blizzard/talents.lua +++ b/SVUI_Skins/components/blizzard/talents.lua @@ -28,12 +28,14 @@ local SpecButtonList = { local function Tab_OnEnter(this) this.backdrop:SetPanelColor("highlight") - this.backdrop:SetBackdropBorderColor(0.1, 0.8, 0.8) + this.backdrop:SetBackdropBorderColor(0.1, 0.8, 0.8, 1) + --this:SetBackdropBorderColor(0.1, 0.8, 0.8, 0.5) end local function Tab_OnLeave(this) this.backdrop:SetPanelColor("dark") - this.backdrop:SetBackdropBorderColor(0,0,0,1) + this.backdrop:SetBackdropBorderColor(0,0,0,0.5) + --this:SetBackdropBorderColor(0,0,0,1) end local function ChangeTabHelper(this) @@ -51,7 +53,7 @@ local function ChangeTabHelper(this) this.backdrop:SetFrameLevel(0) this.backdrop:SetBackdrop(SV.media.backdrop.glow); this.backdrop:SetBackdropColor(0,0,0,1) - this.backdrop:SetBackdropBorderColor(0,0,0,1) + this.backdrop:SetBackdropBorderColor(0,0,0,0.5) this:SetScript("OnEnter", Tab_OnEnter) this:SetScript("OnLeave", Tab_OnLeave) end diff --git a/SVUI_Skins/components/docklet.lua b/SVUI_Skins/components/docklet.lua index 9dc905f..f612936 100644 --- a/SVUI_Skins/components/docklet.lua +++ b/SVUI_Skins/components/docklet.lua @@ -302,24 +302,32 @@ end !DETAILS (IN DEVELOPMENT) ########################################################## ]]-- ---/script print(table.tostring(_detailhes)) -DOCK_EMBEDS["Details"] = function(self) - --print('Details') - if(not IsAddOnLoaded("Details")) then return false end - --print('Loaded') - local width = self:GetWidth() - local height = SV.Dock.BottomRight.Window:GetHeight(); - if(DetailsBaseFrame1) then - DetailsBaseFrame1:ClearAllPoints() - DetailsBaseFrame1:SetParent(self) - DetailsBaseFrame1:SetSize(width, height) - DetailsBaseFrame1:SetPoint("BOTTOM", self, "BOTTOM", 0, 0) - self.Framelink = DetailsBaseFrame1 - return true - else - return false - end -end + +-- DOCK_EMBEDS["Details"] = function(self) +-- if(not IsAddOnLoaded("Details")) then return false end +-- local width = self:GetWidth() +-- local height = SV.Dock.BottomRight.Window:GetHeight(); + +-- if(DetailsBaseFrame1) then +-- DetailsBaseFrame1:ClearAllPoints() +-- DetailsBaseFrame1:SetParent(self) +-- DetailsBaseFrame1:SetSize(width - 4, height - 4) +-- DetailsBaseFrame1:SetPoint("BOTTOM", self, "BOTTOM", 0, 2) +-- DetailsBaseFrame1:SetMovable(false); +-- if(DetailsRowFrame1) then +-- DetailsRowFrame1:ClearAllPoints() +-- DetailsRowFrame1:SetParent(self) +-- DetailsRowFrame1:SetAllPoints(DetailsBaseFrame1) +-- self.Framelink = DetailsRowFrame1 +-- else +-- self.Framelink = DetailsBaseFrame1 +-- end +-- _detalhes.move_janela_func = SV.fubar +-- return true +-- else +-- return false +-- end +-- end --[[ ##########################################################