diff --git a/SVUITheme_Warcraft/SVUITheme_Warcraft.lua b/SVUITheme_Warcraft/SVUITheme_Warcraft.lua new file mode 100644 index 0000000..9de53c6 --- /dev/null +++ b/SVUITheme_Warcraft/SVUITheme_Warcraft.lua @@ -0,0 +1,194 @@ +--[[ +############################################################################## +S U P E R - V I L L A I N - T H E M E By: Munglunch +############################################################################## +########################################################## +LOCALIZED LUA FUNCTIONS +########################################################## +]]-- +--[[ GLOBALS ]]-- +local _G = _G; +local unpack = _G.unpack; +local select = _G.select; +local math = _G.math; +local table = _G.table; +--[[ TABLE METHODS ]]-- +local tsort = table.sort; +--[[ MATH METHODS ]]-- +local random = math.random; +--[[ +########################################################## +GET ADDON DATA +########################################################## +]]-- +local SV = _G["SVUI"]; +local LSM = _G.LibStub("LibSharedMedia-3.0"); + +LSM:Register("border", "SVUI Warcraft Basic Border", [[Interface\Glues\COMMON\TextPanel-Border]]) +LSM:Register("border", "SVUI Warcraft Dialog Border", [[Interface\DialogFrame\UI-DialogBox-Border]]) +LSM:Register("border", "SVUI Warcraft Fancy Border", [[Interface\AddOns\SVUITheme_Warcraft\assets\artwork\THEMED-BORDER]]) + +SV:AssignMedia("font", "default", "Arial Narrow"); +SV:AssignMedia("font", "dialog", "Arial Narrow"); +SV:AssignMedia("font", "title", "Arial Narrow"); +SV:AssignMedia("font", "narrator", "Arial Narrow"); +SV:AssignMedia("font", "lootdialog", "Arial Narrow"); +SV:AssignMedia("font", "rolldialog", "Arial Narrow"); +SV:AssignMedia("font", "number", "Friz Quadrata TT"); +SV:AssignMedia("font", "number_big", "Friz Quadrata TT"); +SV:AssignMedia("font", "header", "Friz Quadrata TT"); +SV:AssignMedia("font", "aura", "Friz Quadrata TT"); +SV:AssignMedia("font", "data", "Friz Quadrata TT"); +SV:AssignMedia("font", "lootnumber", "Friz Quadrata TT"); +SV:AssignMedia("font", "rollnumber", "Friz Quadrata TT"); +SV:AssignMedia("font", "combat", "Morpheus"); +SV:AssignMedia("font", "zone", "Morpheus"); +SV:AssignMedia("font", "alert", "Skurri"); +SV:AssignMedia("font", "caps", "Skurri"); + +--SV:AssignMedia("bordercolor", "default", 1, 1, 1, 1); +SV:AssignMedia("template", "Default", "SVUITheme_Warcraft_Default"); +SV:AssignMedia("template", "Button", "SVUITheme_Warcraft_DockButton"); +SV:AssignMedia("template", "DockButton", "SVUITheme_Warcraft_DockButton"); +SV:AssignMedia("template", "Pattern", "SVUITheme_Warcraft_Default"); +SV:AssignMedia("template", "Premium", "SVUITheme_Warcraft_Default"); +SV:AssignMedia("template", "Model", "SVUITheme_Warcraft_Default"); +SV:AssignMedia("template", "Window", "SVUITheme_Warcraft_Default"); +SV:AssignMedia("template", "Window2", "SVUITheme_Warcraft_Default"); +SV:AssignMedia("template", "Minimap", "SVUITheme_Warcraft_Minimap"); +SV:AssignMedia("template", "ActionPanel", "SVUITheme_Warcraft_ActionPanel"); +SV:AssignMedia("template", "Container", "SVUITheme_Warcraft_Default"); + +local _RefreshZoneText = function(self) + if(self.InfoTop:IsShown()) then + self.InfoTop:Hide(); + end + if(not SV.db.Maps.locationText or SV.db.Maps.locationText == "HIDE") then + self.InfoBottom:Hide(); + else + self.InfoBottom:Show(); + local zone = GetRealZoneText() or UNKNOWN + self.InfoBottom.Text:SetText(zone) + end +end + +local docksparks = { + [[Interface\AddOns\SVUITheme_Warcraft\assets\artwork\Dock\DOCK-SPARKS-1]], + [[Interface\AddOns\SVUITheme_Warcraft\assets\artwork\Dock\DOCK-SPARKS-2]], + [[Interface\AddOns\SVUITheme_Warcraft\assets\artwork\Dock\DOCK-SPARKS-3]], +}; + +local _SetDockButtonTheme = function(_, button, size) + local sparkSize = size * 5; + local sparkOffset = size * 0.5; + + button:SetStyle() + + local sparks = button:CreateTexture(nil, "OVERLAY", nil, 2) + sparks:ModSize(sparkSize, sparkSize) + sparks:SetPoint("CENTER", button, "BOTTOMRIGHT", -sparkOffset, 4) + sparks:SetTexture(docksparks[1]) + sparks:SetVertexColor(0.7, 0.6, 0.5) + sparks:SetBlendMode("ADD") + sparks:SetAlpha(0) + + SV.Animate:Sprite8(sparks, 0.08, 2, false, true) + + button.Sparks = sparks; + + button.ClickTheme = function(self) + self.Sparks:SetTexture(docksparks[random(1,3)]) + self.Sparks.anim:Play() + end +end + +local _SetDockStyleTheme = function(dock, isBottom) + if dock.backdrop then return end + + local backdrop = CreateFrame("Frame", nil, dock) + backdrop:SetAllPoints(dock) + backdrop:SetFrameStrata("BACKGROUND") + backdrop:SetBackdrop({ + bgFile = [[Interface\DialogFrame\UI-DialogBox-Background]], + tile = false, + tileSize = 0, + edgeFile = [[Interface\Glues\COMMON\TextPanel-Border]], + edgeSize = 15, + insets = + { + left = 0, + right = 0, + top = 0, + bottom = 0, + }, + }); + backdrop:SetBackdropColor(0,0,0,0.5); + backdrop:SetBackdropBorderColor(1,1,1,1); + + return backdrop +end + +local _SetBorderTheme = function(self) + self.Border.Top:ModPoint("TOPLEFT", SV.Screen, "TOPLEFT", -1, 1) + self.Border.Top:ModPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", 1, 1) + self.Border.Top:ModHeight(10) + self.Border.Top:SetBackdrop({ + bgFile = [[Interface\BUTTONS\WHITE8X8]], + edgeFile = [[Interface\BUTTONS\WHITE8X8]], + tile = false, + tileSize = 0, + edgeSize = 1, + insets = {left = 0, right = 0, top = 0, bottom = 0} + }) + self.Border.Top:SetBackdropColor(0,0,0,0) + self.Border.Top:SetBackdropBorderColor(0,0,0,0) + self.Border.Top:SetFrameLevel(0) + self.Border.Top:SetFrameStrata('BACKGROUND') + self.Border.Top:SetScript("OnShow", function(self) + self:SetFrameLevel(0) + self:SetFrameStrata('BACKGROUND') + end) + + self.Border.Bottom:ModPoint("BOTTOMLEFT", SV.Screen, "BOTTOMLEFT", -1, -1) + self.Border.Bottom:ModPoint("BOTTOMRIGHT", SV.Screen, "BOTTOMRIGHT", 1, -1) + self.Border.Bottom:ModHeight(10) + self.Border.Bottom:SetBackdrop({ + bgFile = [[Interface\BUTTONS\WHITE8X8]], + edgeFile = [[Interface\BUTTONS\WHITE8X8]], + tile = false, + tileSize = 0, + edgeSize = 1, + insets = {left = 0, right = 0, top = 0, bottom = 0} + }) + self.Border.Bottom:SetBackdropColor(0,0,0,0) + self.Border.Bottom:SetBackdropBorderColor(0,0,0,0) + self.Border.Bottom:SetFrameLevel(0) + self.Border.Bottom:SetFrameStrata('BACKGROUND') + self.Border.Bottom:SetScript("OnShow", function(self) + self:SetFrameLevel(0) + self:SetFrameStrata('BACKGROUND') + end) +end + +function SV:LoadTheme() + if(self.defaults.UnitFrames) then + self:AssignMedia("font", "unitprimary", "Friz Quadrata TT", 14); + self:AssignMedia("font", "unitsecondary", "Friz Quadrata TT", 14); + self:AssignMedia("font", "unitaurabar", "Skurri", 12); + self:AssignMedia("font", "unitaura", "Arial Narrow", 12); + end + if(self.defaults.Maps) then + self:AssignMedia("font", "mapinfo", "Friz Quadrata TT", 14); + self:AssignMedia("font", "mapcoords", "Friz Quadrata TT", 14); + self.defaults.Maps.locationText = "SIMPLE"; + self.defaults.Maps.bordersize = 1; + self.defaults.Maps.bordercolor = "dark"; + end + if(self.Maps) then + self.Maps.RefreshZoneText = _RefreshZoneText + end + + self.Dock.SetButtonTheme = _SetDockButtonTheme + self.Dock.SetThemeDockStyle = _SetDockStyleTheme + self.Dock.SetBorderTheme = _SetBorderTheme +end \ No newline at end of file diff --git a/SVUITheme_Warcraft/SVUITheme_Warcraft.toc b/SVUITheme_Warcraft/SVUITheme_Warcraft.toc new file mode 100644 index 0000000..b9a968e --- /dev/null +++ b/SVUITheme_Warcraft/SVUITheme_Warcraft.toc @@ -0,0 +1,17 @@ +## Interface: 60000 +## Author: S.Jackson +## Version: 1.0.0 +## Title: |cffFF9900SVUI Theme: |r|cff00EFFFWarcraft|r +## Notes: Warcraft Theme for [|cff9911FFSVUI Framework|r]. +## RequiredDeps: SVUI_!Core +## OptionalDeps: LibSharedMedia-3.0 +## LoadOnDemand: 1 +## DefaultState: disabled +## X-SVUITheme: Warcraft +## X-Email: munglunch@gmail.com +## X-Website: http://www.supervillainui.com +## X-Donate: PayPal:munglunch@gmail.com +## X-License: All Rights Reserved +## X-Category: Interface Enhancements + +SVUITheme_Warcraft.xml diff --git a/SVUITheme_Warcraft/SVUITheme_Warcraft.xml b/SVUITheme_Warcraft/SVUITheme_Warcraft.xml new file mode 100644 index 0000000..e79c699 --- /dev/null +++ b/SVUITheme_Warcraft/SVUITheme_Warcraft.xml @@ -0,0 +1,304 @@ +<Ui xmlns="http://www.blizzard.com/wow/ui/"> + <Frame name="SVUITheme_Warcraft_Default" virtual="true"> + <Attributes> + <Attribute name="panelID" type="string" value="default" /> + <Attribute name="panelPadding" type="number" value="1" /> + <Attribute name="panelColor" type="string" value="default" /> + <Attribute name="panelGradient" type="string" value="default" /> + <Attribute name="panelTexUpdate" type="boolean" value="false" /> + <Attribute name="panelSkipUpdate" type="boolean" value="false" /> + <Attribute name="panelBorderColor" type="string" value="light" /> + </Attributes> + <Backdrop bgFile="Interface\DialogFrame\UI-DialogBox-Background" edgeFile="Interface\Glues\COMMON\TextPanel-Border" tile="false"> + <EdgeSize val="15" /> + <TileSize val="0" /> + <BackgroundInsets left="0" right="0" top="0" bottom="0" /> + <Color r="0.2" g="0.2" b="0.2" a="1" /> + <BorderColor r="1" g="1" b="1" a="1" /> + </Backdrop> + </Frame> + <Frame name="SVUITheme_Warcraft_Pattern" virtual="true"> + <Attributes> + <Attribute name="panelID" type="string" value="pattern" /> + <Attribute name="panelPadding" type="number" value="3" /> + <Attribute name="panelColor" type="string" value="special" /> + <Attribute name="panelGradient" type="string" value="special" /> + <Attribute name="panelTexUpdate" type="boolean" value="true" /> + <Attribute name="panelSkipUpdate" type="boolean" value="false" /> + </Attributes> + <Backdrop bgFile="Interface\FrameGeneral\UI-Background-Marble" edgeFile="Interface\Glues\COMMON\TextPanel-Border" tile="false"> + <EdgeSize val="15" /> + <TileSize val="0" /> + <BackgroundInsets left="0" right="0" top="0" bottom="0" /> + <Color r="0.37" g="0.32" b="0.29" a="1" /> + <BorderColor r="0" g="0" b="0" a="1" /> + </Backdrop> + <Frames> + <Frame parentKey="Shadow" inherits="SVUI_ShadowTemplate" /> + </Frames> + </Frame> + <Frame name="SVUITheme_Warcraft_DockButton" virtual="true"> + <Attributes> + <Attribute name="panelID" type="string" value="heavy" /> + <Attribute name="panelPadding" type="number" value="1" /> + <Attribute name="panelColor" type="string" value="default" /> + <Attribute name="panelGradient" type="string" value="default" /> + <Attribute name="panelTexUpdate" type="boolean" value="true" /> + <Attribute name="panelSkipUpdate" type="boolean" value="false" /> + </Attributes> + <Backdrop bgFile="Interface\BUTTONS\WHITE8X8" edgeFile="Interface\BUTTONS\WHITE8X8" tile="false"> + <EdgeSize val="1" /> + <TileSize val="0" /> + <BackgroundInsets left="0" right="0" top="0" bottom="0" /> + <Color r="0.2" g="0.2" b="0.2" a="1" /> + <BorderColor r="0" g="0" b="0" a="1" /> + </Backdrop> + <Layers> + <Layer level="BACKGROUND" textureSubLevel="1"> + <Texture parentKey="Skin" nonBlocking="true" file="Interface\AddOns\SVUITheme_Warcraft\assets\artwork\HEAVY" setAllPoints="true" /> + <Color r="0.2" g="0.2" b="0.2" a="1" /> + </Layer> + <Layer level="BORDER"> + <Texture parentKey="BorderLeft" file="Interface\BUTTONS\WHITE8X8"> + <Anchors> + <Anchor point="TOPLEFT" relativePoint="TOPLEFT" /> + <Anchor point="BOTTOMLEFT" relativePoint="BOTTOMLEFT" /> + </Anchors> + <Size> + <AbsDimension x="1" /> + </Size> + <Color r="0" g="0" b="0" a="1" /> + </Texture> + <Texture parentKey="BorderRight" file="Interface\BUTTONS\WHITE8X8"> + <Anchors> + <Anchor point="TOPRIGHT" relativePoint="TOPRIGHT" /> + <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT" /> + </Anchors> + <Size> + <AbsDimension x="1" /> + </Size> + <Color r="0" g="0" b="0" a="1" /> + </Texture> + <Texture parentKey="BorderTop" file="Interface\BUTTONS\WHITE8X8"> + <Anchors> + <Anchor point="TOPLEFT" relativePoint="TOPLEFT" /> + <Anchor point="TOPRIGHT" relativePoint="TOPRIGHT" /> + </Anchors> + <Size> + <AbsDimension y="1" /> + </Size> + <Color r="0" g="0" b="0" a="1" /> + </Texture> + <Texture parentKey="BorderBottom" file="Interface\BUTTONS\WHITE8X8"> + <Anchors> + <Anchor point="BOTTOMLEFT" relativePoint="BOTTOMLEFT" /> + <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT" /> + </Anchors> + <Size> + <AbsDimension y="1" /> + </Size> + <Color r="0" g="0" b="0" a="1" /> + </Texture> + </Layer> + </Layers> + <Frames> + <Frame parentKey="Shadow" inherits="SVUI_ShadowTemplate" /> + </Frames> + </Frame> + <Frame name="SVUITheme_Warcraft_Window" virtual="true"> + <Attributes> + <Attribute name="panelID" type="string" value="window" /> + <Attribute name="panelPadding" type="number" value="2" /> + <Attribute name="panelColor" type="string" value="light" /> + <Attribute name="panelGradient" type="string" value="light" /> + <Attribute name="panelTexUpdate" type="boolean" value="true" /> + <Attribute name="panelSkipUpdate" type="boolean" value="false" /> + <Attribute name="panelOffset" type="number" value="6" /> + <Attribute name="panelBorderColor" type="string" value="light" /> + </Attributes> + <Backdrop bgFile="Interface\FrameGeneral\UI-Background-Rock" edgeFile="Interface\Glues\COMMON\TextPanel-Border" tile="false"> + <EdgeSize val="20" /> + <TileSize val="0" /> + <BackgroundInsets left="3" right="3" top="3" bottom="3" /> + <Color r="1" g="1" b="1" a="1" /> + <BorderColor r="1" g="1" b="1" a="1" /> + </Backdrop> + <Layers> + <Layer level="BACKGROUND" textureSubLevel="2"> + <Texture parentKey="TopLeft" nonBlocking="true" file="Interface\AddOns\SVUI_!Core\assets\textures\EMPTY"> + <Anchors> + <Anchor point="TOPLEFT" relativePoint="TOPLEFT" x="5" y="-5" /> + <Anchor point="TOPRIGHT" relativePoint="TOP" x="0" y="-5" /> + <Anchor point="BOTTOMLEFT" relativePoint="LEFT" x="5" y="0" /> + </Anchors> + <Color r="0.05" g="0.05" b="0.05" a="0.5" /> + </Texture> + <Texture parentKey="TopRight" nonBlocking="true" file="Interface\AddOns\SVUI_!Core\assets\textures\EMPTY"> + <Anchors> + <Anchor point="TOPRIGHT" relativePoint="TOPRIGHT" x="-5" y="-5" /> + <Anchor point="TOPLEFT" relativePoint="TOP" x="0" y="-5" /> + <Anchor point="BOTTOMRIGHT" relativePoint="RIGHT" x="-5" y="0" /> + </Anchors> + <Color r="0.05" g="0.05" b="0.05" a="0.5" /> + </Texture> + <Texture parentKey="BottomLeft" nonBlocking="true" file="Interface\AddOns\SVUI_!Core\assets\textures\EMPTY"> + <Anchors> + <Anchor point="BOTTOMLEFT" relativePoint="BOTTOMLEFT" x="5" y="5" /> + <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOM" x="0" y="5" /> + <Anchor point="TOPLEFT" relativePoint="LEFT" x="5" y="0" /> + </Anchors> + <Color r="0.1" g="0.1" b="0.1" a="0.5" /> + </Texture> + <Texture parentKey="BottomRight" nonBlocking="true" file="Interface\AddOns\SVUI_!Core\assets\textures\EMPTY"> + <Anchors> + <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT" x="-5" y="5" /> + <Anchor point="BOTTOMLEFT" relativePoint="BOTTOM" x="0" y="5" /> + <Anchor point="TOPRIGHT" relativePoint="RIGHT" x="-5" y="0" /> + </Anchors> + <Color r="0.1" g="0.1" b="0.1" a="0.5" /> + </Texture> + </Layer> + </Layers> + </Frame> + <Frame name="SVUITheme_Warcraft_Window2" virtual="true"> + <Attributes> + <Attribute name="panelID" type="string" value="window2" /> + <Attribute name="panelPadding" type="number" value="2" /> + <Attribute name="panelColor" type="string" value="light" /> + <Attribute name="panelGradient" type="string" value="light" /> + <Attribute name="panelTexUpdate" type="boolean" value="true" /> + <Attribute name="panelSkipUpdate" type="boolean" value="false" /> + <Attribute name="panelOffset" type="number" value="6" /> + <Attribute name="panelBorderColor" type="string" value="light" /> + </Attributes> + <Backdrop bgFile="Interface\FrameGeneral\UI-Background-Marble" edgeFile="Interface\Glues\COMMON\TextPanel-Border" tile="false"> + <EdgeSize val="20" /> + <TileSize val="0" /> + <BackgroundInsets left="3" right="3" top="3" bottom="3" /> + <Color r="1" g="1" b="1" a="1" /> + <BorderColor r="1" g="1" b="1" a="1" /> + </Backdrop> + <Layers> + <Layer level="BACKGROUND" textureSubLevel="2"> + <Texture parentKey="TopLeft" nonBlocking="true" file="Interface\AddOns\SVUI_!Core\assets\textures\EMPTY"> + <Anchors> + <Anchor point="TOPLEFT" relativePoint="TOPLEFT" x="5" y="-5" /> + <Anchor point="TOPRIGHT" relativePoint="TOP" x="0" y="-5" /> + <Anchor point="BOTTOMLEFT" relativePoint="LEFT" x="5" y="0" /> + </Anchors> + <Color r="0.05" g="0.05" b="0.05" a="0.5" /> + </Texture> + <Texture parentKey="TopRight" nonBlocking="true" file="Interface\AddOns\SVUI_!Core\assets\textures\EMPTY"> + <Anchors> + <Anchor point="TOPRIGHT" relativePoint="TOPRIGHT" x="-5" y="-5" /> + <Anchor point="TOPLEFT" relativePoint="TOP" x="0" y="-5" /> + <Anchor point="BOTTOMRIGHT" relativePoint="RIGHT" x="-5" y="0" /> + </Anchors> + <Color r="0.05" g="0.05" b="0.05" a="0.5" /> + </Texture> + <Texture parentKey="BottomLeft" nonBlocking="true" file="Interface\AddOns\SVUI_!Core\assets\textures\EMPTY"> + <Anchors> + <Anchor point="BOTTOMLEFT" relativePoint="BOTTOMLEFT" x="5" y="5" /> + <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOM" x="0" y="5" /> + <Anchor point="TOPLEFT" relativePoint="LEFT" x="5" y="0" /> + </Anchors> + <Color r="0.1" g="0.1" b="0.1" a="0.5" /> + </Texture> + <Texture parentKey="BottomRight" nonBlocking="true" file="Interface\AddOns\SVUI_!Core\assets\textures\EMPTY"> + <Anchors> + <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT" x="-5" y="5" /> + <Anchor point="BOTTOMLEFT" relativePoint="BOTTOM" x="0" y="5" /> + <Anchor point="TOPRIGHT" relativePoint="RIGHT" x="-5" y="0" /> + </Anchors> + <Color r="0.1" g="0.1" b="0.1" a="0.5" /> + </Texture> + </Layer> + </Layers> + </Frame> + <Frame name="SVUITheme_Warcraft_UnitLarge" virtual="true"> + <Attributes> + <Attribute name="panelID" type="string" value="unitlarge" /> + <Attribute name="panelPadding" type="number" value="0" /> + <Attribute name="panelColor" type="string" value="special" /> + <Attribute name="panelGradient" type="boolean" value="false" /> + <Attribute name="panelTexUpdate" type="boolean" value="true" /> + <Attribute name="panelOffset" type="number" value="3" /> + <Attribute name="panelSkipUpdate" type="boolean" value="false" /> + </Attributes> + <Backdrop bgFile="Interface\FrameGeneral\UI-Background-Rock" edgeFile="Interface\BUTTONS\WHITE8X8" tile="false"> + <EdgeSize val="1" /> + <TileSize val="128" /> + <BackgroundInsets left="0" right="0" top="0" bottom="0" /> + <Color r="1" g="1" b="1" a="1" /> + <BorderColor r="0" g="0" b="0" a="1" /> + </Backdrop> + </Frame> + <Frame name="SVUITheme_Warcraft_UnitSmall" virtual="true"> + <Attributes> + <Attribute name="panelID" type="string" value="unitsmall" /> + <Attribute name="panelPadding" type="number" value="0" /> + <Attribute name="panelColor" type="string" value="special" /> + <Attribute name="panelGradient" type="boolean" value="false" /> + <Attribute name="panelTexUpdate" type="boolean" value="true" /> + <Attribute name="panelOffset" type="number" value="3" /> + <Attribute name="panelSkipUpdate" type="boolean" value="false" /> + </Attributes> + <Backdrop bgFile="Interface\FrameGeneral\UI-Background-Rock" edgeFile="Interface\BUTTONS\WHITE8X8" tile="false"> + <EdgeSize val="1" /> + <TileSize val="64" /> + <BackgroundInsets left="0" right="0" top="0" bottom="0" /> + <Color r="1" g="1" b="1" a="1" /> + <BorderColor r="0" g="0" b="0" a="1" /> + </Backdrop> + </Frame> + <Frame name="SVUITheme_Warcraft_ActionPanel" virtual="true"> + <Attributes> + <Attribute name="panelID" type="string" value="actionpanel" /> + <Attribute name="panelKeyOverride" type="string" value="ActionPanel" /> + <Attribute name="panelPadding" type="number" value="1" /> + <Attribute name="panelColor" type="string" value="invisible" /> + <Attribute name="panelGradient" type="boolean" value="false" /> + <Attribute name="panelTexUpdate" type="boolean" value="false" /> + <Attribute name="panelSkipUpdate" type="boolean" value="false" /> + <Attribute name="panelBorderColor" type="string" value="light" /> + <Attribute name="panelOffset" type="number" value="5" /> + </Attributes> + <Backdrop bgFile="Interface\AddOns\SVUI_!Core\assets\textures\EMPTY" edgeFile="Interface\DialogFrame\UI-DialogBox-Border" tile="false"> + <EdgeSize val="20" /> + <TileSize val="0" /> + <BackgroundInsets left="0" right="0" top="0" bottom="0" /> + <Color r="0" g="0" b="0" a="0" /> + <BorderColor r="1" g="1" b="1" a="1" /> + </Backdrop> + </Frame> + <Frame name="SVUITheme_Warcraft_Minimap" virtual="true"> + <Attributes> + <Attribute name="panelID" type="string" value="minimap" /> + <Attribute name="panelPadding" type="number" value="2" /> + <Attribute name="panelColor" type="string" value="light" /> + <Attribute name="panelGradient" type="string" value="light" /> + <Attribute name="panelTexUpdate" type="boolean" value="true" /> + <Attribute name="panelSkipUpdate" type="boolean" value="false" /> + <Attribute name="panelOffset" type="number" value="0" /> + <Attribute name="panelBorderColor" type="string" value="light" /> + </Attributes> + <Backdrop bgFile="Interface\AddOns\SVUI_!Core\assets\textures\EMPTY" edgeFile="Interface\DialogFrame\UI-DialogBox-Border" tile="false"> + <EdgeSize val="32" /> + <TileSize val="0" /> + <BackgroundInsets left="0" right="0" top="0" bottom="0" /> + <Color r="0" g="0" b="0" a="0" /> + <BorderColor r="1" g="1" b="1" a="1" /> + </Backdrop> + <Layers> + <Layer level="BACKGROUND" textureSubLevel="1"> + <Texture parentKey="Skin" nonBlocking="true" file="Interface\AddOns\SVUI_!Core\assets\textures\EMPTY"> + <Anchor point="TOPLEFT" relativePoint="TOPLEFT" x="5" y="-5" /> + <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT" x="-5" y="5" /> + <Color r="0" g="0" b="0" a="0" /> + </Texture> + </Layer> + </Layers> + </Frame> + + <Script file="SVUITheme_Warcraft.lua"/> +</Ui> \ No newline at end of file diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-ADDON.blp b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-ADDON.blp new file mode 100644 index 0000000..c38f93a Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-ADDON.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-BREAKSTUFF.blp b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-BREAKSTUFF.blp new file mode 100644 index 0000000..b778e24 Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-BREAKSTUFF.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-CHAT.blp b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-CHAT.blp new file mode 100644 index 0000000..c61c5fa Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-CHAT.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-GARRISON.blp b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-GARRISON.blp new file mode 100644 index 0000000..cbbe2ac Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-GARRISON.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-HEARTH.blp b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-HEARTH.blp new file mode 100644 index 0000000..74776c0 Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-HEARTH.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-HENCHMAN.blp b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-HENCHMAN.blp new file mode 100644 index 0000000..835d005 Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-HENCHMAN.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-QUESTS.blp b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-QUESTS.blp new file mode 100644 index 0000000..0b7ee68 Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-QUESTS.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-RAIDTOOL.blp b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-RAIDTOOL.blp new file mode 100644 index 0000000..7d2a6a4 Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-RAIDTOOL.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-SNACK.blp b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-SNACK.blp new file mode 100644 index 0000000..27e176d Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-ICON-SNACK.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-SPARKS-1.blp b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-SPARKS-1.blp new file mode 100644 index 0000000..03281c6 Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-SPARKS-1.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-SPARKS-2.blp b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-SPARKS-2.blp new file mode 100644 index 0000000..9a4b442 Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-SPARKS-2.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-SPARKS-3.blp b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-SPARKS-3.blp new file mode 100644 index 0000000..6f07c90 Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/DOCK-SPARKS-3.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/LABEL-DUR.blp b/SVUITheme_Warcraft/assets/artwork/Dock/LABEL-DUR.blp new file mode 100644 index 0000000..0021afa Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/LABEL-DUR.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/LABEL-REP.blp b/SVUITheme_Warcraft/assets/artwork/Dock/LABEL-REP.blp new file mode 100644 index 0000000..a455cf9 Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/LABEL-REP.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/LABEL-XP.blp b/SVUITheme_Warcraft/assets/artwork/Dock/LABEL-XP.blp new file mode 100644 index 0000000..d1033e1 Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/LABEL-XP.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/Dock/PROFESSIONS.blp b/SVUITheme_Warcraft/assets/artwork/Dock/PROFESSIONS.blp new file mode 100644 index 0000000..c1f8518 Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/Dock/PROFESSIONS.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/HEAVY.blp b/SVUITheme_Warcraft/assets/artwork/HEAVY.blp new file mode 100644 index 0000000..9b1b0d3 Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/HEAVY.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/SPLASH.blp b/SVUITheme_Warcraft/assets/artwork/SPLASH.blp new file mode 100644 index 0000000..e58d74f Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/SPLASH.blp differ diff --git a/SVUITheme_Warcraft/assets/artwork/THEMED-BORDER1.blp b/SVUITheme_Warcraft/assets/artwork/THEMED-BORDER1.blp new file mode 100644 index 0000000..fd7098e Binary files /dev/null and b/SVUITheme_Warcraft/assets/artwork/THEMED-BORDER1.blp differ diff --git a/SVUI_!Core/system/api.lua b/SVUI_!Core/system/api.lua index 55ac65f..ce6bb69 100644 --- a/SVUI_!Core/system/api.lua +++ b/SVUI_!Core/system/api.lua @@ -1535,16 +1535,20 @@ MOD.Concepts["ArrowButton"] = function(self, adjustable, frame, direction, targe end end -MOD.Concepts["ItemButton"] = function(self, adjustable, frame, adjustedIcon, noScript) +MOD.Concepts["ItemButton"] = function(self, adjustable, frame, noScript) if(not frame) then return end RemoveTextures(frame) if(not frame.Panel) then - self.Methods["Frame"](self, frame, (not adjustable), "Button", true, 1, -1, -1) if(not noScript) then + self.Methods["Frame"](self, frame, false, "Button", true, 1, -1, -1) frame:HookScript("OnEnter", Button_OnEnter) frame:HookScript("OnLeave", Button_OnLeave) + else + self.Methods["Frame"](self, frame, false, "Inset", true, 1, -1, -1) + -- frame:HookScript("OnEnter", ConceptButton_OnEnter) + -- frame:HookScript("OnLeave", ConceptButton_OnLeave) end end @@ -1555,7 +1559,7 @@ MOD.Concepts["ItemButton"] = function(self, adjustable, frame, adjustedIcon, noS local subNameObject = _G[("%sSubName"):format(link)] local arrowObject = _G[("%sFlyoutArrow"):format(link)] local levelObject = _G[("%sLevel"):format(link)] - local iconObject = _G[("%sIcon"):format(link)] or _G[("%sIconTexture"):format(link)] or frame.Icon + local iconObject = _G[("%sIcon"):format(link)] or _G[("%sIconTexture"):format(link)] or frame.Icon or frame.icon local countObject = _G[("%sCount"):format(link)] if(not frame.Riser) then @@ -1569,7 +1573,7 @@ MOD.Concepts["ItemButton"] = function(self, adjustable, frame, adjustedIcon, noS if(iconObject) then iconObject:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - if(adjustedIcon) then + if(not adjustable) then iconObject:InsetPoints(frame, 2, 2) end if(not frame.IconShadow) then @@ -1969,6 +1973,7 @@ MOD.Concepts["Skin"] = function(self, style, frame, topX, topY, bottomX, bottomY local skin = frame:CreateTexture(nil, "BACKGROUND", nil, -1) skin:SetAllPoints(borderFrame) skin:SetTexture(texture) + skin:SetGradient(unpack(SV.media.gradient.special)) end local ALERT_TEMPLATE = { diff --git a/SVUI_!Core/system/overrides.lua b/SVUI_!Core/system/overrides.lua index dcb6554..62cb7a3 100644 --- a/SVUI_!Core/system/overrides.lua +++ b/SVUI_!Core/system/overrides.lua @@ -765,6 +765,59 @@ _G.GroupLootDropDown_GiveLoot = function(self) end --[[ ########################################################## +BAIL OUT BUTTON +########################################################## +]]-- +local SVUI_BailOut = CreateFrame("Button", "SVUI_BailOut", UIParent) +SVUI_BailOut:SetSize(50, 50) +SVUI_BailOut:SetPoint("TOP", SVUI_DockTopCenter, "BOTTOM", 0, -10) + +local BailOut_OnUpdate = function(self, elapsed) + if (not self.elapsed) then + if (elapsed >= 1.5) then + self.elapsed = 0 + elapsed + end + else + self.elapsed = (self.elapsed or 0) + elapsed + if (self.elapsed >= 0.5) then + if(not UnitOnTaxi("player")) then + print('Killing Bailout') + self.elapsed = nil + self:SetScript('OnUpdate', nil) + self:Hide() + else + self.elapsed = 0 + end + end + end +end + +local BailOut_OnHook = function() + SVUI_BailOut:Show() + SVUI_BailOut:SetScript('OnUpdate', BailOut_OnUpdate) +end + +local BailOut_OnEvent = function(self, event, ...) + if((event == "UNIT_ENTERED_VEHICLE" and CanExitVehicle()) or UnitControllingVehicle("player") or UnitInVehicle("player")) then + self:Show() + elseif(UnitOnTaxi("player")) then + self:Show() + self:SetScript('OnUpdate', BailOut_OnUpdate) + else + self:Hide() + end +end + +local BailOut_OnClick = function(self, event, ...) + if(UnitOnTaxi("player")) then + print('Early Landing Requested') + TaxiRequestEarlyLanding() + else + VehicleExit() + end +end +--[[ +########################################################## MISC OVERRIDES ########################################################## ]]-- @@ -776,10 +829,6 @@ local SVUI_AltPowerBar = CreateFrame("Frame", "SVUI_AltPowerBar", UIParent) SVUI_AltPowerBar:SetPoint("TOP", SVUI_DockTopCenter, "BOTTOM", 0, -60) SVUI_AltPowerBar:SetSize(128, 50) -local SVUI_BailOut = CreateFrame("Button", "SVUI_BailOut", UIParent) -SVUI_BailOut:SetSize(50, 50) -SVUI_BailOut:SetPoint("TOP", SVUI_DockTopCenter, "BOTTOM", 0, -10) - local PVPRaidNoticeHandler = function(self, event, msg) local _, instanceType = IsInInstance() if((instanceType == 'pvp') or (instanceType == 'arena')) then @@ -824,26 +873,6 @@ local Dura_OnSetPoint = function(self, _, parent) end end -local BailOut_OnHook = function() - SVUI_BailOut:Show() -end - -local BailOut_OnEvent = function(self, event, ...) - if((event == "UNIT_ENTERED_VEHICLE" and CanExitVehicle()) or UnitControllingVehicle("player") or UnitInVehicle("player") or UnitOnTaxi("player")) then - self:Show() - else - self:Hide() - end -end - -local BailOut_OnClick = function(self, event, ...) - if(UnitOnTaxi("player")) then - TaxiRequestEarlyLanding() - else - VehicleExit() - end -end - local function AlterBlizzMainBar() if(not SV.ActionBars and MainMenuBar) then MainMenuBar:ClearAllPoints() diff --git a/SVUI_Skins/components/blizzard/encounterjournal.lua b/SVUI_Skins/components/blizzard/encounterjournal.lua index d88e185..ae7956a 100644 --- a/SVUI_Skins/components/blizzard/encounterjournal.lua +++ b/SVUI_Skins/components/blizzard/encounterjournal.lua @@ -94,12 +94,11 @@ local function Outline(frame, noHighlight) frame.Outlined = true end -local function _hook_EncounterJournal_DisplayEncounter() - local parent = EncounterJournalEncounterFrameInfoOverviewScrollFrameScrollChild; +local function _hook_EncounterJournal_SetBullets(object, ...) + local parent = object:GetParent(); if (parent.Bullets and #parent.Bullets > 0) then - print(#parent.Bullets) for i = 1, #parent.Bullets do - local bullet = parent.Bullets[1]; + local bullet = parent.Bullets[i]; bullet.Text:SetTextColor(1,1,1) end end @@ -133,15 +132,9 @@ local function EncounterJournalStyle() EncounterJournalEncounterFrameInfoOverviewScrollFrameScrollChildTitle:SetTextColor(1,1,0) EncounterJournalEncounterFrameInfoOverviewScrollFrameScrollChildLoreDescription:SetTextColor(1,1,1) EncounterJournalEncounterFrameInfoOverviewScrollFrameScrollChild.overviewDescription.Text:SetTextColor(1,1,1) - local bulletParent = EncounterJournalEncounterFrameInfoOverviewScrollFrameScrollChild; - if (bulletParent.Bullets and #bulletParent.Bullets > 0) then - for i = 1, #bulletParent.Bullets do - local bullet = bulletParent.Bullets[1]; - bullet.Text:SetTextColor(1,1,1) - end - end EncounterJournalSearchResults:RemoveTextures(true) + SV.API:Set("EditBox", EncounterJournalSearchBox) EncounterJournal:SetStyle("Frame", "Window2") EncounterJournal:SetPanelColor("dark") @@ -156,14 +149,6 @@ local function EncounterJournalStyle() SV.API:Set("SkinPremium", EncounterJournalEncounterFrameInfoBossesScrollFrame, -20, 40, 0, 0) - -- local comicHolder = CreateFrame('Frame', nil, EncounterJournal.encounter) - -- comicHolder:SetPoint("TOPLEFT", EncounterJournalEncounterFrameInfoBossesScrollFrame, "TOPLEFT", -20, 40) - -- comicHolder:SetPoint("BOTTOMRIGHT", EncounterJournalEncounterFrameInfoBossesScrollFrame, "BOTTOMRIGHT", 0, 0) - -- comicHolder:SetStyle("Frame", "Premium") - -- comicHolder:SetPanelColor("dark") - -- EncounterJournal.encounter.info.encounterTitle:SetParent(comicHolder) - -- EncounterJournal.searchResults.TitleText:SetParent(comicHolder) - EncounterJournalNavBarHomeButton:SetStyle("Button") EncounterJournalEncounterFrameInfoDifficulty:SetStyle("Button") EncounterJournalEncounterFrameInfoDifficulty:SetFrameLevel(EncounterJournalEncounterFrameInfoDifficulty:GetFrameLevel() + 10) @@ -197,7 +182,15 @@ local function EncounterJournalStyle() instanceButton = frame["instance"..index] end - --hooksecurefunc("EncounterJournal_DisplayEncounter", _hook_EncounterJournal_DisplayEncounter) + local bulletParent = EncounterJournalEncounterFrameInfoOverviewScrollFrameScrollChild; + if (bulletParent.Bullets and #bulletParent.Bullets > 0) then + for i = 1, #bulletParent.Bullets do + local bullet = bulletParent.Bullets[1]; + bullet.Text:SetTextColor(1,1,1) + end + end + + hooksecurefunc("EncounterJournal_SetBullets", _hook_EncounterJournal_SetBullets) hooksecurefunc("EncounterJournal_ListInstances", function() local frame = EncounterJournal.instanceSelect.scroll.child @@ -211,16 +204,36 @@ local function EncounterJournalStyle() end) EncounterJournal.instanceSelect.raidsTab:GetFontString():SetTextColor(1, 1, 1); - hooksecurefunc("EncounterJournal_ToggleHeaders", function() - local usedHeaders = EncounterJournal.encounter.usedHeaders - for key,used in pairs(usedHeaders) do - if(not used.button.Panel) then - used:RemoveTextures(true) - used.button:RemoveTextures(true) - used.button:SetStyle("Button") + hooksecurefunc("EncounterJournal_ToggleHeaders", function(self, isOverview) + if (not isOverview) then + local usedHeaders = EncounterJournal.encounter.usedHeaders + for key,used in pairs(usedHeaders) do + if(not used.button.Panel) then + used:RemoveTextures(true) + used.button:RemoveTextures(true) + used.button:SetStyle("Button") + end + used.description:SetTextColor(1, 1, 1) + --used.button.portrait.icon:Hide() + end + else + local overviews = EncounterJournal.encounter.overviewFrame.overviews + for i = 1, #overviews do + local overview = overviews[i]; + if(overview) then + if(not overview.Panel) then + overview:RemoveTextures(true) + overview.button:RemoveTextures(true) + overview:SetStyle("Button") + end + if(overview.loreDescription) then + overview.loreDescription:SetTextColor(1, 1, 1) + end + if(overview.description) then + overview.description:SetTextColor(1, 1, 1) + end + end end - used.description:SetTextColor(1, 1, 1) - --used.button.portrait.icon:Hide() end end) @@ -237,9 +250,7 @@ local function EncounterJournalStyle() index = offset + i; if index <= numLoot then item.icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - if(not item.Panel) then - item:SetStyle("!_Frame", "Icon") - end + SV.API:Set("ItemButton", item) item.slot:SetTextColor(0.5, 1, 0) item.armorType:SetTextColor(1, 1, 0) item.boss:SetTextColor(0.7, 0.08, 0) diff --git a/SVUI_Skins/components/blizzard/misc.lua b/SVUI_Skins/components/blizzard/misc.lua index e3ae00c..c95471c 100644 --- a/SVUI_Skins/components/blizzard/misc.lua +++ b/SVUI_Skins/components/blizzard/misc.lua @@ -21,7 +21,7 @@ local MissingLootFrame_OnShow = function(self) for i = 1, numMissing do local slot = _G["MissingLootFrameItem"..i] local icon = slot.icon; - SV.API:Set("ItemButton", slot, true) + SV.API:Set("!_ItemButton", slot) local texture, name, count, quality = GetMissingLootItemInfo(i); local r,g,b,hex = GetItemQualityColor(quality) if(not r) then @@ -582,10 +582,10 @@ local function MiscStyles() SV.API:Set("PageButton", PetStablePrevPageButton) SV.API:Set("PageButton", PetStableNextPageButton) for i = 1, NUM_PET_ACTIVE_SLOTS do - SV.API:Set("ItemButton", _G['PetStableActivePet'..i], true) + SV.API:Set("!_ItemButton", _G['PetStableActivePet'..i]) end for i = 1, NUM_PET_STABLE_SLOTS do - SV.API:Set("ItemButton", _G['PetStableStabledPet'..i], true) + SV.API:Set("!_ItemButton", _G['PetStableStabledPet'..i]) end PetStableSelectedPetIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) end diff --git a/SVUI_Skins/components/blizzard/petjournal.lua b/SVUI_Skins/components/blizzard/petjournal.lua index 7c7dd74..53f2ce0 100644 --- a/SVUI_Skins/components/blizzard/petjournal.lua +++ b/SVUI_Skins/components/blizzard/petjournal.lua @@ -112,7 +112,7 @@ local function CollectionsJournalStyle() for i = 1, #buttons do local button = buttons[i] if(button) then - SV.API:Set("ItemButton", button, nil, true, true) + SV.API:Set("ItemButton", button) local bar = _G["SVUI_MountSelectBar"..i] if(bar) then bar:SetParent(button.Panel) end if(button.favorite) then @@ -151,7 +151,7 @@ local function CollectionsJournalStyle() for i = 1, #PetJournal.listScroll.buttons do local button = _G["PetJournalListScrollFrameButton" .. i] local favorite = _G["PetJournalListScrollFrameButton" .. i .. "Favorite"] - SV.API:Set("ItemButton", button, false, true) + SV.API:Set("ItemButton", button) if(not button.Riser) then local fg = CreateFrame("Frame", nil, button) fg:SetAllPoints(button) @@ -175,7 +175,7 @@ local function CollectionsJournalStyle() PetJournalListScrollFrame:HookScript("OnVerticalScroll", PetJournal_UpdatePets) PetJournalListScrollFrame:HookScript("OnMouseWheel", PetJournal_UpdatePets) PetJournalAchievementStatus:DisableDrawLayer('BACKGROUND') - SV.API:Set("ItemButton", PetJournalHealPetButton, true) + SV.API:Set("!_ItemButton", PetJournalHealPetButton) PetJournalHealPetButton.texture:SetTexture([[Interface\Icons\spell_magic_polymorphrabbit]]) PetJournalLoadoutBorder:RemoveTextures() @@ -187,7 +187,7 @@ local function CollectionsJournalStyle() pjPet.hover = true; pjPet.pushed = true; pjPet.checked = true; - SV.API:Set("ItemButton", pjPet, nil, nil, true) + SV.API:Set("ItemButton", pjPet, true) pjPet.setButton:RemoveTextures() _G['PetJournalLoadoutPet'..b..'HealthFrame'].healthBar:RemoveTextures() _G['PetJournalLoadoutPet'..b..'HealthFrame'].healthBar:SetStyle("Frame", 'Default') @@ -216,11 +216,11 @@ local function CollectionsJournalStyle() end PetJournalPetCard:RemoveTextures() - SV.API:Set("ItemButton", PetJournalPetCard, nil, nil, true) + SV.API:Set("ItemButton", PetJournalPetCard, true) PetJournalPetCardInset:RemoveTextures() PetJournalPetCardPetInfo.levelBG:SetAlpha(0) PetJournalPetCardPetInfoIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - SV.API:Set("ItemButton", PetJournalPetCardPetInfo, nil, true, true) + SV.API:Set("ItemButton", PetJournalPetCardPetInfo, true) local fg = CreateFrame("Frame", nil, PetJournalPetCardPetInfo) fg:SetSize(40,40) @@ -270,7 +270,7 @@ local function CollectionsJournalStyle() ToyBox:RemoveTextures() ToyBox.searchBox:SetStyle("Editbox") - ToyBoxFilterButton:RemoveTextures() + ToyBoxFilterButton:RemoveTextures(true) ToyBoxFilterButton:SetStyle("Button") ToyBox.iconsFrame:RemoveTextures() ToyBox.iconsFrame:SetStyle("!_Frame", 'Model') @@ -282,7 +282,7 @@ local function CollectionsJournalStyle() HeirloomsJournal:RemoveTextures() HeirloomsJournal.SearchBox:SetStyle("Editbox") - HeirloomsJournalFilterButton:RemoveTextures() + HeirloomsJournalFilterButton:RemoveTextures(true) HeirloomsJournalFilterButton:SetStyle("Button") HeirloomsJournal.iconsFrame:RemoveTextures() HeirloomsJournal.iconsFrame:SetStyle("!_Frame", 'Model') @@ -293,7 +293,9 @@ local function CollectionsJournalStyle() SV.API:Set("PageButton", HeirloomsJournal.navigationFrame.prevPageButton) SV.API:Set("PageButton", HeirloomsJournal.navigationFrame.nextPageButton) - MountJournalFilterButton:RemoveTextures() + SV.API:Set("DropDown", HeirloomsJournalClassDropDown) + + MountJournalFilterButton:RemoveTextures(true) MountJournalFilterButton:SetStyle("Button") MountJournal.SummonRandomFavoriteButton:RemoveTextures() diff --git a/SVUI_Skins/components/blizzard/talents.lua b/SVUI_Skins/components/blizzard/talents.lua index 03e08c5..3fdc1bf 100644 --- a/SVUI_Skins/components/blizzard/talents.lua +++ b/SVUI_Skins/components/blizzard/talents.lua @@ -173,7 +173,7 @@ local function TalentFrameStyle() for z = 1, NUM_TALENT_COLUMNS do local talentItem = _G[("%sTalent%d"):format(gName, z)] if(talentItem) then - SV.API:Set("!_ItemButton", talentItem) + SV.API:Set("ItemButton", talentItem) end end end diff --git a/SVUI_Skins/components/blizzard/transmog.lua b/SVUI_Skins/components/blizzard/transmog.lua index 1b12932..84ebce3 100644 --- a/SVUI_Skins/components/blizzard/transmog.lua +++ b/SVUI_Skins/components/blizzard/transmog.lua @@ -91,8 +91,8 @@ local function TransmogStyle() TransmogrifyConfirmationPopup:SetStyle("Frame", "Pattern") TransmogrifyConfirmationPopup.Button1:SetStyle("Button") TransmogrifyConfirmationPopup.Button2:SetStyle("Button") - SV.API:Set("ItemButton", TransmogrifyConfirmationPopupItemFrame1, true) - SV.API:Set("ItemButton", TransmogrifyConfirmationPopupItemFrame2, true) + SV.API:Set("!_ItemButton", TransmogrifyConfirmationPopupItemFrame1) + SV.API:Set("!_ItemButton", TransmogrifyConfirmationPopupItemFrame2) end --[[ ##########################################################