diff --git a/Interface/AddOns/SVUI/SVUI.xml b/Interface/AddOns/SVUI/SVUI.xml index 2021972..247d57d 100644 --- a/Interface/AddOns/SVUI/SVUI.xml +++ b/Interface/AddOns/SVUI/SVUI.xml @@ -94,4 +94,103 @@ </Button> </Frames> </Frame> + + <Button name="OverrideTabButtonTemplate" virtual="true"> + <Size> + <AbsDimension x="115" y="24"/> + </Size> + <Layers> + <Layer level="BORDER"> + <Texture name="$parentLeftDisabled" file="Interface\AddOns\SVUI\assets\artwork\Template\EMPTY"> + <Size> + <AbsDimension x="20" y="24"/> + </Size> + <Anchors> + <Anchor point="BOTTOMLEFT"> + <Offset> + <AbsDimension x="0" y="-3"/> + </Offset> + </Anchor> + </Anchors> + </Texture> + <Texture name="$parentMiddleDisabled" file="Interface\AddOns\SVUI\assets\artwork\Template\EMPTY"> + <Size> + <AbsDimension x="88" y="24"/> + </Size> + <Anchors> + <Anchor point="LEFT" relativeTo="$parentLeftDisabled" relativePoint="RIGHT"/> + </Anchors> + </Texture> + <Texture name="$parentRightDisabled" file="Interface\AddOns\SVUI\assets\artwork\Template\EMPTY"> + <Size> + <AbsDimension x="20" y="24"/> + </Size> + <Anchors> + <Anchor point="LEFT" relativeTo="$parentMiddleDisabled" relativePoint="RIGHT"/> + </Anchors> + </Texture> + <Texture name="$parentLeft" file="Interface\AddOns\SVUI\assets\artwork\Template\EMPTY"> + <Size> + <AbsDimension x="20" y="24"/> + </Size> + <Anchors> + <Anchor point="TOPLEFT"/> + </Anchors> + </Texture> + <Texture name="$parentMiddle" file="Interface\AddOns\SVUI\assets\artwork\Template\EMPTY"> + <Size> + <AbsDimension x="88" y="24"/> + </Size> + <Anchors> + <Anchor point="LEFT" relativeTo="$parentLeft" relativePoint="RIGHT"/> + </Anchors> + </Texture> + <Texture name="$parentRight" file="Interface\AddOns\SVUI\assets\artwork\Template\EMPTY"> + <Size> + <AbsDimension x="20" y="24"/> + </Size> + <Anchors> + <Anchor point="LEFT" relativeTo="$parentMiddle" relativePoint="RIGHT"/> + </Anchors> + </Texture> + </Layer> + </Layers> + <Scripts> + <OnLoad> + self:SetFrameLevel(self:GetFrameLevel() + 4); + self.deselectedTextY = -3; + self.selectedTextY = -2; + </OnLoad> + <OnShow> + PanelTemplates_TabResize(self, 0); + _G[self:GetName().."HighlightTexture"]:SetWidth(self:GetTextWidth() + 30); + </OnShow> + </Scripts> + <ButtonText name="$parentText"> + <Anchors> + <Anchor point="CENTER"> + <Offset> + <AbsDimension x="0" y="-3"/> + </Offset> + </Anchor> + </Anchors> + </ButtonText> + <NormalFont style="GameFontNormalSmall"/> + <HighlightFont style="GameFontHighlightSmall"/> + <DisabledFont style="GameFontHighlightSmall"/> + <HighlightTexture name="$parentHighlightTexture" file="Interface\AddOns\SVUI\assets\artwork\Template\EMPTY" alphaMode="ADD"> + <Anchors> + <Anchor point="LEFT"> + <Offset> + <AbsDimension x="10" y="-4"/> + </Offset> + </Anchor> + <Anchor point="RIGHT"> + <Offset> + <AbsDimension x="-10" y="-4"/> + </Offset> + </Anchor> + </Anchors> + </HighlightTexture> + </Button> </Ui> \ No newline at end of file diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TOOLTIP.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TOOLTIP.blp index b2fe857..bfa8130 100644 Binary files a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TOOLTIP.blp and b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TOOLTIP.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-BOTTOM-OVERLAY.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-BOTTOM-OVERLAY.blp deleted file mode 100644 index d13c9bc..0000000 Binary files a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-BOTTOM-OVERLAY.blp and /dev/null differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-BOTTOM.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-BOTTOM.blp index d56e49a..26f3c8b 100644 Binary files a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-BOTTOM.blp and b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-BOTTOM.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-LEFT-OVERLAY.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-LEFT-OVERLAY.blp deleted file mode 100644 index 32679b9..0000000 Binary files a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-LEFT-OVERLAY.blp and /dev/null differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-LEFT.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-LEFT.blp index 4953e7d..dd074a4 100644 Binary files a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-LEFT.blp and b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-LEFT.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-RIGHT-OVERLAY.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-RIGHT-OVERLAY.blp deleted file mode 100644 index 04b8e22..0000000 Binary files a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-RIGHT-OVERLAY.blp and /dev/null differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-RIGHT.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-RIGHT.blp index d766a16..ba70927 100644 Binary files a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-RIGHT.blp and b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-RIGHT.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-TOP-OVERLAY.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-TOP-OVERLAY.blp deleted file mode 100644 index 2382659..0000000 Binary files a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-TOP-OVERLAY.blp and /dev/null differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-TOP.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-TOP.blp index 290449e..a5e2461 100644 Binary files a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-TOP.blp and b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-TOP.blp differ diff --git a/Interface/AddOns/SVUI/packages/stats/common/dps.lua b/Interface/AddOns/SVUI/packages/stats/common/dps.lua index bfe856a..94464a9 100644 --- a/Interface/AddOns/SVUI/packages/stats/common/dps.lua +++ b/Interface/AddOns/SVUI/packages/stats/common/dps.lua @@ -13,7 +13,7 @@ _____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_ # S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## -STATS:Extend EXAMPLE USAGE: MOD:Extend(newStat,eventList,onEvents,update,click,focus,blur) +STATS:Extend EXAMPLE USAGE: MOD:Extend(newStat,eventList,onEvents,update,click,focus,blur,load) ########################################################## LOCALIZED LUA FUNCTIONS @@ -23,27 +23,9 @@ LOCALIZED LUA FUNCTIONS local _G = _G; local unpack = _G.unpack; local select = _G.select; -local pairs = _G.pairs; -local ipairs = _G.ipairs; -local type = _G.type; -local error = _G.error; -local pcall = _G.pcall; -local assert = _G.assert; -local tostring = _G.tostring; -local tonumber = _G.tonumber; -local tinsert = _G.tinsert; local string = _G.string; -local math = _G.math; -local table = _G.table; --[[ STRING METHODS ]]-- -local lower, upper = string.lower, string.upper; -local find, format, len, split = string.find, string.format, string.len, string.split; local match, sub, join = string.match, string.sub, string.join; -local gmatch, gsub = string.gmatch, string.gsub; ---[[ MATH METHODS ]]-- -local abs, ceil, floor, round = math.abs, math.ceil, math.floor, math.round; -- Basic ---[[ TABLE METHODS ]]-- -local twipe, tsort = table.wipe, table.sort; --[[ ########################################################## GET ADDON DATA @@ -66,7 +48,6 @@ local timeStamp = 0 local lastSegment = 0 local lastPanel local displayString = ''; -local join = string.join local function Reset() timeStamp = 0 diff --git a/Interface/AddOns/SVUI/packages/stats/common/hps.lua b/Interface/AddOns/SVUI/packages/stats/common/hps.lua index 485daa8..7218d53 100644 --- a/Interface/AddOns/SVUI/packages/stats/common/hps.lua +++ b/Interface/AddOns/SVUI/packages/stats/common/hps.lua @@ -114,6 +114,7 @@ local function HPS_OnEvent(self, event, ...) local id = select(4, ...) if id == playerID or id == petID then if timeStamp == 0 then timeStamp = select(1, ...) end + local overHeal = select(16, ...) lastSegment = timeStamp combatTime = select(1, ...) - timeStamp lastHealAmount = select(15, ...) diff --git a/Interface/AddOns/SVUI/packages/tip/SVTip.lua b/Interface/AddOns/SVUI/packages/tip/SVTip.lua index 40bfeb7..206ceea 100644 --- a/Interface/AddOns/SVUI/packages/tip/SVTip.lua +++ b/Interface/AddOns/SVUI/packages/tip/SVTip.lua @@ -52,10 +52,11 @@ local NIL_COLOR = { r = 1, g = 1, b = 1 }; local TAPPED_COLOR = { r = .6, g = .6, b = .6 }; local SKULL_ICON = "|TInterface\\TARGETINGFRAME\\UI-TargetingFrame-Skull.blp:16:16|t"; local TAMABLE_INDICATOR = "|cffFFFF00Tamable|r"; +local TT_BG = [[Interface\Addons\SVUI\assets\artwork\Template\Tooltip\TOOLTIP]] local TT_TOP = [[Interface\Addons\SVUI\assets\artwork\Template\Tooltip\TT-TOP]] local TT_BOTTOM = [[Interface\Addons\SVUI\assets\artwork\Template\Tooltip\TT-BOTTOM]] -local TT_RIGHT = [[Interface\Addons\SVUI\assets\artwork\Template\Tooltip\TT-RIGHT-OVERLAY]] -local TT_LEFT = [[Interface\Addons\SVUI\assets\artwork\Template\Tooltip\TT-LEFT-OVERLAY]] +local TT_RIGHT = [[Interface\Addons\SVUI\assets\artwork\Template\Tooltip\TT-RIGHT]] +local TT_LEFT = [[Interface\Addons\SVUI\assets\artwork\Template\Tooltip\TT-LEFT]] local TAMABLE_FAMILIES = { ["Basilisk"] = true, ["Bat"] = true, ["Bear"] = true, ["Beetle"] = true, @@ -164,6 +165,44 @@ end CORE FUNCTIONS ########################################################## ]]-- +local SetMaskBorder = function(self, r, g, b) + r,g,b = (r * 0.5),(g * 0.5),(b * 0.5) + self[5]:SetTexture(r, g, b) + self[6]:SetTexture(r, g, b) + self[7]:SetTexture(r, g, b) + self[8]:SetTexture(r, g, b) +end + +local SetBurstColor = function(self, r, g, b) + local a = self.ToggleAlpha + self[1]:SetVertexColor(r, g, b, a) + self[2]:SetVertexColor(r, g, b, a) + self[3]:SetVertexColor(0, 0, 0, 0) + self[4]:SetVertexColor(0, 0, 0, 0) + self:SetMaskBorder(r, g, b) +end + +local SetToneColor = function(self, r, g, b) + local a = self.ToggleAlpha + self[1]:SetVertexColor(0, 0, 0, 0) + self[2]:SetVertexColor(0, 0, 0, 0) + self[3]:SetVertexColor(r, g, b, a) + self[4]:SetVertexColor(r, g, b, a) + self:SetMaskBorder(r, g, b) +end + +local ClearMaskColors = function(self) + self[1]:SetVertexColor(0, 0, 0, 0) + self[2]:SetVertexColor(0, 0, 0, 0) + self[3]:SetVertexColor(0, 0, 0, 0) + self[4]:SetVertexColor(0, 0, 0, 0) + + self[5]:SetTexture(0, 0, 0) + self[6]:SetTexture(0, 0, 0) + self[7]:SetTexture(0, 0, 0) + self[8]:SetTexture(0, 0, 0) +end + local _hook_GameTooltip_ShowCompareItem = function(self, shift) if not self then self = GameTooltip end local _,link = self:GetItem() @@ -351,6 +390,10 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self) local realmRelation = UnitRealmRelationship(unit) colors = RAID_CLASS_COLORS[classToken] + local burst = SVUI_CLASS_COLORS[classToken] + + self.SuperBorder:SetBurstColor(burst.r, burst.g, burst.b) + if MOD.db.playerTitles and pvpName then unitName = pvpName end @@ -403,8 +446,10 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self) else if UnitIsTapped(unit) and not UnitIsTappedByPlayer(unit) then colors = TAPPED_COLOR + self.SuperBorder:SetToneColor(colors.r, colors.g, colors.b) else colors = FACTION_BAR_COLORS[UnitReaction(unit, "player")] + self.SuperBorder:SetToneColor(colors.r, colors.g, colors.b) end lvlLine = tiplevel(self, 2) @@ -546,7 +591,8 @@ local _hook_OnSetUnitAura = function(self, unit, index, filter) local name = UnitName(caster) local _, class = UnitClass(caster) local color = RAID_CLASS_COLORS[class] - if color then + if color then + self.SuperBorder:SetMaskBorder(color.r, color.g, color.b) self:AddDoubleLine(("|cFFCA3C3C%s|r %d"):format(ID, spellID), format("|c%s%s|r", color.colorStr, name)) end else @@ -564,7 +610,8 @@ local _hook_OnSetHyperUnitAura = function(self, unit, index, filter) local name = UnitName(caster) local _, class = UnitClass(caster) local color = RAID_CLASS_COLORS[class] - if color then + if color then + self.SuperBorder:SetMaskBorder(color.r, color.g, color.b) self:AddDoubleLine(("|cFFCA3C3C%s|r"):format(auraName), format("|c%s%s|r", color.colorStr, name)) end else @@ -642,34 +689,6 @@ local _hook_OnTipCleared = function(self) self.itemCleared = nil end -local _hook_OnTipShow = function(self) - local width,height = self:GetSize() - local heightScale = min(64, height) - local widthScale = min(128, width) - local heightWidth = widthScale * 0.35 - self.SuperBorder[1]:SetSize(widthScale,heightWidth) - self.SuperBorder[2]:SetSize(heightScale,heightScale) - self.SuperBorder[3]:SetSize(widthScale,heightWidth) - - self:SetBackdrop({ - bgFile = [[Interface\BUTTONS\WHITE8X8]], - edgeFile = [[Interface\BUTTONS\WHITE8X8]], - tile = false, - edgeSize = 1 - }) - self:SetBackdropColor(0, 0, 0, 0) - self:SetBackdropBorderColor(0, 0, 0, 0) - - self.SuperBorder:SetBackdrop({ - bgFile = [[Interface\BUTTONS\WHITE8X8]], - edgeFile = [[Interface\BUTTONS\WHITE8X8]], - tile = false, - edgeSize = 1 - }) - self.SuperBorder:SetBackdropColor(0, 0, 0, 0.8) - self.SuperBorder:SetBackdropBorderColor(0, 0, 0) -end - local _hook_OnItemRef = function(link,text,button,chatFrame) if find(link,"^spell:") then local ref = sub(link,7) @@ -694,10 +713,55 @@ end local Override_BorderColor = function(self, r, g, b, a) if(b ~= 0 or (a and a ~= 0)) then self:SetBackdropBorderColor(0, 0, 0, 0) - self.SuperBorder:SetBackdropBorderColor(0, 0, 0) + self.SuperBorder:SetBackdropBorderColor(0, 0, 0) + self.SuperBorder:SetToneColor(r, g, b) end end +local _hook_OnTipShow = function(self) + local width,height = self:GetSize() + local heightScale = min(64, height) + local widthScale = min(128, width) + local heightWidth = widthScale * 0.35 + + self:SetBackdrop({ + bgFile = TT_BG, + edgeFile = [[Interface\BUTTONS\WHITE8X8]], + tile = true, + tileSize = 128, + edgeSize = 1 + }) + self:SetBackdropColor(0, 0, 0, 0) + self:SetBackdropBorderColor(0, 0, 0, 0) + + local mask = self.SuperBorder + mask:SetPoint("TOPLEFT", self, "TOPLEFT", 0, 0) + if(GameTooltipStatusBar:IsShown()) then + mask:SetPoint("BOTTOMRIGHT", self, "BOTTOMRIGHT", 0, mask.ToggleHeight) + else + mask:SetPoint("BOTTOMRIGHT", self, "BOTTOMRIGHT", 0, 0) + end + + mask[1]:SetSize(widthScale,heightWidth) + mask[2]:SetSize(widthScale,heightWidth) + mask[3]:SetSize(heightScale,heightScale) + mask[4]:SetSize(heightScale,heightScale) + + mask:SetBackdrop({ + bgFile = TT_BG, + edgeFile = [[Interface\BUTTONS\WHITE8X8]], + tile = true, + tileSize = 128, + edgeSize = 1 + }) + mask:SetBackdropColor(0, 0, 0, 1) + mask:SetBackdropBorderColor(0, 0, 0, 1) +end + +local _hook_OnTipHide = function(self) + self.SuperBorder:ClearMaskColors() +end + function MOD:Load() BNToastFrame:Point("TOPRIGHT", SVUI_MinimapFrame, "BOTTOMLEFT", 0, -10) SuperVillain:SetSVMovable(BNToastFrame, "BNET_MOVE", L["BNet Frame"]) @@ -715,54 +779,102 @@ function MOD:Load() for _, tooltip in pairs(tooltips) do if(tooltip.SuperBorder) then return end - local barOffset = 6 + local barOffset = 0 + local alpha = 0.2 if(tooltip == GameTooltip) then - barOffset = barHeight + 6 + barOffset = (barHeight + 6) * -1 + alpha = 0.5 end local mask = CreateFrame("Frame", nil, tooltip) mask:SetPoint("TOPLEFT", tooltip, "TOPLEFT", 0, 0) - mask:SetPoint("BOTTOMRIGHT", tooltip, "BOTTOMRIGHT", 0, -barOffset) + mask:SetPoint("BOTTOMRIGHT", tooltip, "BOTTOMRIGHT", 0, barOffset) mask:SetFrameLevel(tooltip:GetFrameLevel() - 1) + mask.ToggleHeight = barOffset + mask.ToggleAlpha = alpha + + --[[ STARBURST TOP ]] mask[1] = mask:CreateTexture(nil, "BACKGROUND") - mask[1]:SetPoint("BOTTOMRIGHT", mask, "TOPRIGHT", 0, 0) + mask[1]:SetPoint("BOTTOMLEFT", mask, "TOPLEFT", 0, 0) mask[1]:SetHeight(mask:GetWidth() * 0.25) mask[1]:SetWidth(mask:GetWidth() * 0.25) mask[1]:SetTexture(TT_TOP) mask[1]:SetVertexColor(0,0,0) mask[1]:SetBlendMode("BLEND") - mask[1]:SetAlpha(0.8) + mask[1]:SetAlpha(alpha) + --[[ STARBURST BOTTOM ]] mask[2] = mask:CreateTexture(nil, "BACKGROUND") - mask[2]:SetPoint("LEFT", mask, "RIGHT", 0, 0) - mask[2]:SetSize(64,64) - mask[2]:SetTexture(TT_RIGHT) + mask[2]:SetPoint("TOPRIGHT", mask, "BOTTOMRIGHT", 0, 0) + mask[2]:SetHeight(mask:GetWidth() * 0.25) + mask[2]:SetWidth(mask:GetWidth() * 0.25) + mask[2]:SetTexture(TT_BOTTOM) mask[2]:SetVertexColor(0,0,0) mask[2]:SetBlendMode("BLEND") - mask[2]:SetAlpha(0.8) + mask[2]:SetAlpha(alpha) + --[[ HALFTONE RIGHT ]] mask[3] = mask:CreateTexture(nil, "BACKGROUND") - mask[3]:SetPoint("TOPRIGHT", mask, "BOTTOMRIGHT", 0, 0) - mask[3]:SetHeight(mask:GetWidth() * 0.25) - mask[3]:SetWidth(mask:GetWidth() * 0.25) - mask[3]:SetTexture(TT_BOTTOM) + mask[3]:SetPoint("LEFT", mask, "RIGHT", 0, 0) + mask[3]:SetSize(64,64) + mask[3]:SetTexture(TT_RIGHT) mask[3]:SetVertexColor(0,0,0) mask[3]:SetBlendMode("BLEND") - mask[3]:SetAlpha(0.8) + mask[3]:SetAlpha(alpha) + --[[ HALFTONE LEFT ]] + mask[4] = mask:CreateTexture(nil, "BACKGROUND") + mask[4]:SetPoint("RIGHT", mask, "LEFT", 0, 0) + mask[4]:SetSize(64,64) + mask[4]:SetTexture(TT_LEFT) + mask[4]:SetVertexColor(0,0,0) + mask[4]:SetBlendMode("BLEND") + mask[4]:SetAlpha(alpha) + + --[[ BORDER TOP ]] + mask[5] = mask:CreateTexture(nil, "OVERLAY") + mask[5]:SetPoint("TOPLEFT", mask, "TOPLEFT", 0, 0) + mask[5]:SetPoint("TOPRIGHT", mask, "TOPRIGHT", 0, 0) + mask[5]:SetHeight(1) + mask[5]:SetTexture(0,0,0) + --[[ BORDER BOTTOM ]] + mask[6] = mask:CreateTexture(nil, "OVERLAY") + mask[6]:SetPoint("BOTTOMLEFT", mask, "BOTTOMLEFT", 0, 0) + mask[6]:SetPoint("BOTTOMRIGHT", mask, "BOTTOMRIGHT", 0, 0) + mask[6]:SetHeight(1) + mask[6]:SetTexture(0,0,0) + --[[ BORDER RIGHT ]] + mask[7] = mask:CreateTexture(nil, "OVERLAY") + mask[7]:SetPoint("TOPRIGHT", mask, "TOPRIGHT", 0, 0) + mask[7]:SetPoint("BOTTOMRIGHT", mask, "BOTTOMRIGHT", 0, 0) + mask[7]:SetWidth(1) + mask[7]:SetTexture(0,0,0) + --[[ BORDER LEFT ]] + mask[8] = mask:CreateTexture(nil, "OVERLAY") + mask[8]:SetPoint("TOPLEFT", mask, "TOPLEFT", 0, 0) + mask[8]:SetPoint("BOTTOMLEFT", mask, "BOTTOMLEFT", 0, 0) + mask[8]:SetWidth(1) + mask[8]:SetTexture(0,0,0) mask:SetBackdrop({ - bgFile = [[Interface\BUTTONS\WHITE8X8]], + bgFile = TT_BG, edgeFile = [[Interface\BUTTONS\WHITE8X8]], - tile = false, + tile = true, + tileSize = 128, edgeSize = 1 }) - mask:SetBackdropColor(0, 0, 0, 0.8) + mask:SetBackdropColor(0, 0, 0, 1) mask:SetBackdropBorderColor(0, 0, 0) + mask.SetMaskBorder = SetMaskBorder + mask.SetBurstColor = SetBurstColor + mask.SetToneColor = SetToneColor + mask.ClearMaskColors = ClearMaskColors + tooltip.SuperBorder = mask tooltip:SetBackdrop({ - bgFile = [[Interface\BUTTONS\WHITE8X8]], + bgFile = TT_BG, edgeFile = [[Interface\BUTTONS\WHITE8X8]], - tile = false, + tileSize = 128, + tile = true, edgeSize = 1 }) tooltip:SetBackdropColor(0, 0, 0, 0) @@ -772,14 +884,14 @@ function MOD:Load() NewHook(tooltip, "SetBackdropColor", Override_BGColor) NewHook(tooltip, "SetBackdropBorderColor", Override_BorderColor) tooltip:HookScript("OnShow", _hook_OnTipShow) + tooltip:HookScript("OnHide", _hook_OnTipHide) end GameTooltipStatusBar:Height(barHeight) GameTooltipStatusBar:SetStatusBarTexture(SuperVillain.Media.bar.default) - GameTooltipStatusBar:SetFixedPanelTemplate("Bar", true) GameTooltipStatusBar:ClearAllPoints() - GameTooltipStatusBar:SetPoint("BOTTOMLEFT", GameTooltip.SuperBorder, "BOTTOMLEFT", 1, 1) - GameTooltipStatusBar:SetPoint("BOTTOMRIGHT", GameTooltip.SuperBorder, "BOTTOMRIGHT", -1, 1) + GameTooltipStatusBar:SetPoint("BOTTOMLEFT", GameTooltip.SuperBorder, "BOTTOMLEFT", 3, 3) + GameTooltipStatusBar:SetPoint("BOTTOMRIGHT", GameTooltip.SuperBorder, "BOTTOMRIGHT", -3, 3) GameTooltipStatusBar.text = GameTooltipStatusBar:CreateFontString(nil, "OVERLAY") GameTooltipStatusBar.text:Point("CENTER", GameTooltipStatusBar, "CENTER", 0, 0) GameTooltipStatusBar.text:SetFontTemplate(SuperVillain.Shared:Fetch("font", MOD.db.healthBar.font), MOD.db.healthBar.fontSize, "OUTLINE") diff --git a/Interface/AddOns/SVUI/packages/unit/common/aurabars.lua b/Interface/AddOns/SVUI/packages/unit/common/aurabars.lua index 8971f5e..1c745b9 100644 --- a/Interface/AddOns/SVUI/packages/unit/common/aurabars.lua +++ b/Interface/AddOns/SVUI/packages/unit/common/aurabars.lua @@ -94,13 +94,19 @@ do return false; end local barDB = db.aurabar - local filtered = (caster == "player" or caster == "vehicle") and true or false; - local allowed = true; + local isPlayer = caster == "player" or caster == "vehicle" + local filtered = true + local fromPlayer = true local pass = false; local friendly = UnitIsFriend("player", unit) == 1 and true or false; if _test(barDB.filterPlayer, friendly) then - allowed = filtered; + if isPlayer then + filtered = true + else + filtered = false + end + fromPlayer = filtered; pass = true end if _test(barDB.filterDispellable, friendly) then @@ -137,7 +143,7 @@ do if active and active ~= "" and SuperVillain.Filters[active] then local spellsDB = SuperVillain.Filters[active]; if active ~= "Blocked" then - if spellsDB[name] and spellsDB[name].enable and allowed then + if spellsDB[name] and spellsDB[name].enable and fromPlayer then filtered = true elseif not pass then filtered = false diff --git a/Interface/AddOns/SVUI/packages/unit/common/auras.lua b/Interface/AddOns/SVUI/packages/unit/common/auras.lua index a4dacba..5e33af4 100644 --- a/Interface/AddOns/SVUI/packages/unit/common/auras.lua +++ b/Interface/AddOns/SVUI/packages/unit/common/auras.lua @@ -251,12 +251,13 @@ do return false; end local auraDB = db[auraType] - local filtered = (caster == "player" or caster == "vehicle") and true or false; - local allowed = true; + local isPlayer = caster == "player" or caster == "vehicle" + local filtered = true + local fromPlayer = true; local pass = false; local friendly = UnitIsFriend("player", unit) == 1 and true or false; - icon.isPlayer = filtered; + icon.isPlayer = isPlayer; icon.owner = caster; icon.name = name; icon.priority = 0; @@ -267,7 +268,12 @@ do end if _test(auraDB.filterPlayer, friendly) then - allowed = filtered; + if isPlayer then + filtered = true + else + filtered = false + end + fromPlayer = filtered; pass = true end if _test(auraDB.filterDispellable, friendly) then @@ -307,7 +313,7 @@ do if active and active ~= "" and SuperVillain.Filters[active] then local spellDB = SuperVillain.Filters[active]; if active ~= "Blocked" then - if spellDB[name] and spellDB[name].enable and allowed then + if spellDB[name] and spellDB[name].enable and fromPlayer then filtered = true; icon.priority = spellDB[name].priority; if active == "Shield" and (spellID == 86698 or spellID == 86669) then diff --git a/Interface/AddOns/SVUI/scripts/_load.xml b/Interface/AddOns/SVUI/scripts/_load.xml index 8effc80..5cc2910 100644 --- a/Interface/AddOns/SVUI/scripts/_load.xml +++ b/Interface/AddOns/SVUI/scripts/_load.xml @@ -8,5 +8,5 @@ <Script file='totems.lua'/> <Script file='raid.lua'/> <Script file='reactions.lua'/> - <Script file='pvp.lua'/> + <!-- <Script file='pvp.lua'/> --> </Ui> \ No newline at end of file diff --git a/Interface/AddOns/SVUI/system/classes/Database.lua b/Interface/AddOns/SVUI/system/classes/Database.lua index 1d98f74..4bd4461 100644 --- a/Interface/AddOns/SVUI/system/classes/Database.lua +++ b/Interface/AddOns/SVUI/system/classes/Database.lua @@ -3272,10 +3272,10 @@ local DatabaseDefaults = { ["itemUpgrade"] = true, }, ["addons"] = { - ["enable"] = true, - ["ace3"] = true, + ["enable"] = true, ["Skada"] = true, - ["Recount"] = true, + ["Recount"] = true, + ["AuctionLite"] = true, ["AtlasLoot"] = true, ["SexyCooldown"] = true, ["Lightheaded"] = true, diff --git a/Interface/AddOns/SVUI/system/system.lua b/Interface/AddOns/SVUI/system/system.lua index b67af5f..bb2d00a 100644 --- a/Interface/AddOns/SVUI/system/system.lua +++ b/Interface/AddOns/SVUI/system/system.lua @@ -291,7 +291,15 @@ SYSTEM UPDATES ]]-- function SuperVillain:VersionCheck() local minimumVersion = 4.06; - if(not SVUI_Profile.SAFEDATA.install_version or (SVUI_Profile.SAFEDATA.install_version and (tonumber(SVUI_Profile.SAFEDATA.install_version) < minimumVersion))) then + local installedVersion = SVUI_Profile.SAFEDATA.install_version + if(installedVersion) then + if(type(installedVersion) == "string") then + installedVersion = tonumber(SVUI_Profile.SAFEDATA.install_version) + end + if(type(installedVersion) == "number" and installedVersion < minimumVersion) then + self:Install(true) + end + else self:Install(true) end end diff --git a/Interface/AddOns/SVUI/system/templates.lua b/Interface/AddOns/SVUI/system/templates.lua index 8197bd8..5a610e7 100644 --- a/Interface/AddOns/SVUI/system/templates.lua +++ b/Interface/AddOns/SVUI/system/templates.lua @@ -1204,9 +1204,10 @@ AppendMethods(OBJECT:CreateFontString()) OBJECT = EnumerateFrames() while OBJECT do - if not HANDLER[OBJECT:GetObjectType()] then + local objType = OBJECT:GetObjectType() + if not HANDLER[objType] then AppendMethods(OBJECT) - HANDLER[OBJECT:GetObjectType()] = true + HANDLER[objType] = true end OBJECT = EnumerateFrames(OBJECT) end \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua index 58238fe..ffaa82c 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua @@ -85,9 +85,9 @@ CORE FUNCTIONS ########################################################## ]]-- function StyleVillain:LoadAlert(MainText, Function) - StyleVillain.Alert.Text:SetText(MainText) - StyleVillain.Alert.Accept:SetScript('OnClick', Function) - StyleVillain.Alert:Show() + self.Alert.Text:SetText(MainText) + self.Alert.Accept:SetScript('OnClick', Function) + self.Alert:Show() end function StyleVillain:IsAddonReady(this, ...) @@ -108,32 +108,32 @@ function StyleVillain:SaveAddonStyle(addon, fn, force, passive, ...) hasEvent = true; end; end; - if passive then StyleVillain.PassiveAddons[addon] = true end; - if not StyleVillain.AddOnEvents[addon] then - StyleVillain.AddOnEvents[addon] = {}; - StyleVillain.AddOnEvents[addon]["complete"] = false; + if passive then self.PassiveAddons[addon] = true end; + if not self.AddOnEvents[addon] then + self.AddOnEvents[addon] = {}; + self.AddOnEvents[addon]["complete"] = false; if hasEvent then - StyleVillain.AddOnEvents[addon]["events"] = args; + self.AddOnEvents[addon]["events"] = args; end end if force then fn() - StyleVillain.AddOnQueue[addon] = nil + self.AddOnQueue[addon] = nil else - StyleVillain.AddOnQueue[addon] = fn + self.AddOnQueue[addon] = fn end end; function StyleVillain:SaveBlizzardStyle(addon, fn, force, passive, preload) - if passive then StyleVillain.PassiveAddons[addon] = true end; + if passive then self.PassiveAddons[addon] = true end; if force then if(preload and not IsAddOnLoaded(addon)) then LoadAddOn(addon) end fn() - StyleVillain.BlizzardQueue[addon] = nil + self.BlizzardQueue[addon] = nil else - StyleVillain.BlizzardQueue[addon] = fn + self.BlizzardQueue[addon] = fn end end; @@ -141,28 +141,26 @@ function StyleVillain:SaveCustomStyle(fn) tinsert(StyleVillain.CustomQueue, fn) end; -function StyleVillain:DefineEventFunction(event,addon) - if not self[event] then - self[event] = function(self, event, ...) +function StyleVillain:DefineEventFunction(addonEvent, addon) + if(not self.EventListeners[addonEvent]) then + self.EventListeners[addonEvent] = {} + end + if(addon) then + self.EventListeners[addonEvent][addon] = true + end + if(not self[addonEvent]) then + self[addonEvent] = function(self, event, ...) for addon,fn in pairs(self.AddOnQueue)do - if self:IsAddonReady(addon) and self.EventListeners[event][addon] then - local t = {} - for i=1,select('#',...)do - local arg = select(i,...) - if arg then tinsert(t,arg) end; - end; - local _,error = pcall(fn, self, event, unpack(t)) + if self:IsAddonReady(addon) and self.EventListeners[event] and self.EventListeners[event][addon] then + local _,error = pcall(fn, event, ...) end end end; - self:RegisterEvent(event); - end - if addon then - self.EventListeners[event][addon] = true + SVUIAddonEventHandler:RegisterEvent(addonEvent); end end -function StyleVillain:SafeEventRemoval(addon,event) +function StyleVillain:SafeEventRemoval(addon, event) if not self.EventListeners[event] then return end; if not self.EventListeners[event][addon] then return end; self.EventListeners[event][addon] = nil; @@ -174,15 +172,15 @@ function StyleVillain:SafeEventRemoval(addon,event) end end; if not defined then - self:UnregisterEvent(event) + SVUIAddonEventHandler:UnregisterEvent(event) end end; function StyleVillain:RefreshAddonStyles() for addon,fn in pairs(self.AddOnQueue) do if(SuperVillain.db.SVStyle.addons[addon] == true) then - if IsAddOnLoaded(addon) then - local _,error = pcall(fn, self, "PLAYER_ENTERING_WORLD") + if IsAddOnLoaded(addon) then + local _,error = pcall(fn, "PLAYER_ENTERING_WORLD") end end end @@ -209,7 +207,7 @@ function StyleVillain:LoadStyles() if(not self.AddOnEvents[addon]["complete"]) then if self.AddOnEvents[addon]["events"] then for event,_ in pairs(self.AddOnEvents[addon]["events"]) do - self:DefineEventFunction(event) + self:DefineEventFunction(event, addon) end end self.AddOnEvents[addon]["complete"] = true @@ -682,8 +680,13 @@ end SuperVillain.Registry:NewScript(LoadStyleOMatic) SuperVillain.Registry:NewPlugin(SVUIAddOnName, StyleVillain.SetConfigOptions) -local Registry_OnEvent = function(self, event, addon) +local Registry_OnEvent = function(self, event, ...) + -- print("--------------------------------------") + -- print("Registered Event Fired: ") + -- print(event) + -- print("--------------------------------------") if(event == "ADDON_LOADED") then + local addon = select(1, ...) if StyleVillain.PassiveAddons[addon] then StyleVillain.BlizzardQueue[addon]() StyleVillain.BlizzardQueue[addon] = nil; @@ -691,7 +694,9 @@ local Registry_OnEvent = function(self, event, addon) end; if not SuperVillain.CoreEnabled or not StyleVillain.BlizzardQueue[addon] then return end; StyleVillain.BlizzardQueue[addon]() - StyleVillain.BlizzardQueue[addon] = nil + StyleVillain.BlizzardQueue[addon] = nil + elseif(StyleVillain[event]) then + StyleVillain[event](StyleVillain, event, ...) end end SVUIAddonEventHandler:SetScript("OnEvent", Registry_OnEvent) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua index 2f7b651..f55d97b 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/supervillain.lua @@ -15,6 +15,8 @@ S U P E R - V I L L A I N - U I By: Munglunch # --]] local SuperVillain, L = unpack(SVUI); local STYLE = _G.StyleVillain; +local AceGUI = LibStub("AceGUI-3.0", true); +local NOOP = function() end --[[ ########################################################## ALERTFRAME STYLER @@ -37,10 +39,291 @@ local function SVUICoreStyle() alert.copper:SetEditboxTemplate() end end -end; +end --[[ ########################################################## STYLE LOADING ########################################################## ]]-- -STYLE:SaveCustomStyle(SVUICoreStyle) \ No newline at end of file +STYLE:SaveCustomStyle(SVUICoreStyle) +--[[ +########################################################## +CONFIG STYLER +########################################################## +]]-- +local function Ace3_OnEnter(b) + b:SetBackdropBorderColor(unpack(SuperVillain.Media.color.highlight)) +end +local function Ace3_OnLeave(b) + b:SetBackdropBorderColor(0,0,0,1) +end +local function Ace3_ScrollStyle(e, f) + if _G[e:GetName().."BG"]then + _G[e:GetName().."BG"]:SetTexture(nil) + end + if _G[e:GetName().."Track"]then + _G[e:GetName().."Track"]:SetTexture(nil) + end + if _G[e:GetName().."Top"]then + _G[e:GetName().."Top"]:SetTexture(nil) + _G[e:GetName().."Bottom"]:SetTexture(nil) + _G[e:GetName().."Middle"]:SetTexture(nil) + end + if _G[e:GetName().."ScrollUpButton"] and _G[e:GetName().."ScrollDownButton"] then + _G[e:GetName().."ScrollUpButton"]:Formula409() + if not _G[e:GetName().."ScrollUpButton"].icon then + STYLE:ApplyPaginationStyle(_G[e:GetName().."ScrollUpButton"]) + SquareButton_SetIcon(_G[e:GetName().."ScrollUpButton"], "UP") + _G[e:GetName().."ScrollUpButton"]:Size(_G[e:GetName().."ScrollUpButton"]:GetWidth()+7, _G[e:GetName().."ScrollUpButton"]:GetHeight()+7) + end + _G[e:GetName().."ScrollDownButton"]:Formula409() + if not _G[e:GetName().."ScrollDownButton"].icon then + STYLE:ApplyPaginationStyle(_G[e:GetName().."ScrollDownButton"]) + SquareButton_SetIcon(_G[e:GetName().."ScrollDownButton"], "DOWN") + _G[e:GetName().."ScrollDownButton"]:Size(_G[e:GetName().."ScrollDownButton"]:GetWidth()+7, _G[e:GetName().."ScrollDownButton"]:GetHeight()+7) + end + if not e.styledBackground then + e.styledBackground = CreateFrame("Frame", nil, e) + e.styledBackground:Point("TOPLEFT", _G[e:GetName().."ScrollUpButton"], "BOTTOMLEFT", 0, -1) + e.styledBackground:Point("BOTTOMRIGHT", _G[e:GetName().."ScrollDownButton"], "TOPRIGHT", 0, 1) + e.styledBackground:SetPanelTemplate("Inset", true) + end + if e:GetThumbTexture()then + if not f then + f = 3 + end + e:GetThumbTexture():SetTexture("Interface\\Buttons\\UI-ScrollBar-Knob") + end + end +end + +local function Ace3_ButtonStyle(h, i, j) + if h.Left then h.Left:SetAlpha(0)end + if h.Middle then h.Middle:SetAlpha(0)end + if h.Right then h.Right:SetAlpha(0)end + if h.SetNormalTexture then h:SetNormalTexture("")end + if h.SetHighlightTexture then h:SetHighlightTexture("")end + if h.SetPushedTexture then h:SetPushedTexture("")end + if h.SetDisabledTexture then h:SetDisabledTexture("")end + if i then h:Formula409()end + if not h.template and not j then h:SetFixedPanelTemplate("Button")end + h:HookScript("OnEnter", Ace3_OnEnter)h:HookScript("OnLeave", Ace3_OnLeave) +end + +local function Ace3_PaginationStyle(...) + STYLE:ApplyPaginationStyle(...) +end + +local function StyleAce3() + if not AceGUI then return end + local savedFn = AceGUI.RegisterAsWidget; + AceGUI.RegisterAsWidget = function(b, m) + local n = m.type; + if n == "MultiLineEditBox"then + local e = m.frame; + e:SetFixedPanelTemplate("Pattern") + if not m.scrollBG.template then + m.scrollBG:SetFixedPanelTemplate("Inset") + end + Ace3_ButtonStyle(m.button) + Ace3_ScrollStyle(m.scrollBar) + m.scrollBar:SetPoint("RIGHT", e, "RIGHT", 0-4) + m.scrollBG:SetPoint("TOPRIGHT", m.scrollBar, "TOPLEFT", -2, 19) + m.scrollBG:SetPoint("BOTTOMLEFT", m.button, "TOPLEFT") + m.scrollFrame:SetPoint("BOTTOMRIGHT", m.scrollBG, "BOTTOMRIGHT", -4, 8) + elseif n == "CheckBox"then + m.checkbg:MUNG()m.highlight:MUNG() + if not m.styledCheckBG then + m.styledCheckBG = CreateFrame("Frame", nil, m.frame) + m.styledCheckBG:FillInner(m.check) + m.styledCheckBG:SetFixedPanelTemplate("Inset") + end + m.check:SetParent(m.styledCheckBG) + elseif n == "Dropdown"then + local e = m.dropdown; + local o = m.button; + local p = m.text; + e:Formula409() + o:ClearAllPoints() + o:Point("RIGHT", e, "RIGHT", -20, 0) + o:SetFrameLevel(o:GetFrameLevel() + 1) + Ace3_PaginationStyle(o, true) + if not e.Panel then + e:SetPanelTemplate("Inset") + e.Panel:Point("TOPLEFT", e, "TOPLEFT", 20, -2) + e.Panel:Point("BOTTOMRIGHT", e, "BOTTOMRIGHT", -20, 2) + local level = e:GetFrameLevel() + if(level > 0) then + e.Panel:SetFrameLevel(level - 1) + else + e.Panel:SetFrameLevel(0) + end + end + o:SetParent(e.Panel) + p:SetParent(e.Panel) + o:HookScript("OnClick", function(s) + local b = s.obj; + b.pullout.frame:SetFixedPanelTemplate("Default") + end) + elseif n == "LSM30_Font" or n == "LSM30_Sound" or n == "LSM30_Border" or n == "LSM30_Background" or n == "LSM30_Statusbar" then + local e = m.frame; + local o = e.dropButton; + local p = e.text; + e:Formula409() + Ace3_PaginationStyle(o, true) + e.text:ClearAllPoints() + e.text:Point("RIGHT", o, "LEFT", -2, 0) + o:ClearAllPoints() + o:Point("RIGHT", e, "RIGHT", -10, -6) + if not e.Panel then + e:SetFixedPanelTemplate("Inset") + if n == "LSM30_Font"then + e.Panel:Point("TOPLEFT", 20, -17) + elseif n == "LSM30_Sound"then + e.Panel:Point("TOPLEFT", 20, -17) + m.soundbutton:SetParent(e.Panel) + m.soundbutton:ClearAllPoints() + m.soundbutton:Point("LEFT", e.Panel, "LEFT", 2, 0) + elseif n == "LSM30_Statusbar"then + e.Panel:Point("TOPLEFT", 20, -17) + m.bar:SetParent(e.Panel) + m.bar:FillInner() + elseif n == "LSM30_Border"or n == "LSM30_Background"then + e.Panel:Point("TOPLEFT", 42, -16) + end + e.Panel:Point("BOTTOMRIGHT", o, "BOTTOMRIGHT", 2, -2) + end + o:SetParent(e.Panel) + p:SetParent(e.Panel) + o:HookScript("OnClick", function(s, o)local b = s.obj; + if(b.dropdown and not b.dropdown.Panel) then + local e = b.dropdown + e:SetPanelTemplate("Inset") + e.Panel:Point("TOPLEFT", e, "TOPLEFT", 20, -2) + e.Panel:Point("BOTTOMRIGHT", e, "BOTTOMRIGHT", -20, 2) + local level = e:GetFrameLevel() + if(level > 0) then + e.Panel:SetFrameLevel(level - 1) + else + e.Panel:SetFrameLevel(0) + end + end + end) + elseif n == "EditBox" then + local e = m.editbox; + local o = m.button; + _G[e:GetName().."Left"]:MUNG() + _G[e:GetName().."Middle"]:MUNG() + _G[e:GetName().."Right"]:MUNG() + e:Height(17) + e:SetFixedPanelTemplate("Inset") + local level = e:GetFrameLevel() + if(level > 0) then + e.Panel:SetFrameLevel(level - 1) + else + e.Panel:SetFrameLevel(0) + end + Ace3_ButtonStyle(o) + elseif n == "Button"then + local e = m.frame;Ace3_ButtonStyle(e, nil, true) + e:Formula409() + e:SetFixedPanelTemplate("Button", true) + e.Panel:FillInner() + m.text:SetParent(e.Panel) + elseif n == "Slider"then + local e = m.slider; + local t = m.editbox; + local u = m.lowtext; + local v = m.hightext; + local w = 20; + e:Formula409() + e:SetFixedPanelTemplate("Inset") + e:Height(w) + e:SetThumbTexture("Interface\\Buttons\\UI-ScrollBar-Knob") + e:GetThumbTexture():SetVertexColor(0.8, 0.8, 0.8) + t:SetFixedPanelTemplate("Inset") + t:Height(15) + t:Point("TOP", e, "BOTTOM", 0, -1) + u:SetPoint("TOPLEFT", e, "BOTTOMLEFT", 2, -2) + v:SetPoint("TOPRIGHT", e, "BOTTOMRIGHT", -2, -2) + end + return savedFn(b, m) + end + local x = AceGUI.RegisterAsContainer; + local y = false; + AceGUI.RegisterAsContainer = function(b, m) + local n = m.type; + if n == "ScrollFrame" then + local e = m.scrollbar; + Ace3_ScrollStyle(e) + elseif n == "Window" then + local e = m.content:GetParent() + e:SetPanelTemplate("Halftone") + elseif n == "InlineGroup" or n == "TreeGroup" or n == "TabGroup" or n == "SimpleGroup" or n == "Frame" or n == "DropdownGroup" then + local e = m.content:GetParent() + if n == "Frame" then + e:Formula409() + for z = 1, e:GetNumChildren()do + local A = select(z, e:GetChildren()) + if A:GetObjectType() == "Button"and A:GetText() then + Ace3_ButtonStyle(A) + else + A:Formula409() + end + end + end + if not m.treeframe then + if not y then + e:SetPanelTemplate("Halftone") + e.Panel:SetFrameLevel(0) + y = true + else + e:SetFixedPanelTemplate("Default") + end + end + if m.treeframe then + m.treeframe:SetFixedPanelTemplate("Inset") + e:Point("TOPLEFT", m.treeframe, "TOPRIGHT", 1, 0) + local B = m.CreateButton;m.CreateButton = function(b) + local o = B(b)o.toggle:Formula409() + o.toggle.SetNormalTexture = NOOP; + o.toggle.SetPushedTexture = NOOP; + o.toggleText = o.toggle:CreateFontString(nil, "OVERLAY") + o.toggleText:SetFontTemplate(nil, 19) + o.toggleText:SetPoint("CENTER") + o.toggleText:SetText("+") + return o + end + local C = m.RefreshTree;m.RefreshTree = function(b, D)C(b, D) + if not b.tree then return end + local E = b.status or b.localstatus; + local F = E.groups; + local G = b.lines; + local H = b.buttons; + for z, I in pairs(G)do + local o = H[z] + if F[I.uniquevalue]and o then + o.toggleText:SetText("-") + elseif o then + o.toggleText:SetText("+") + end + end + end + end + if n == "TabGroup" then + local J = m.CreateTab;m.CreateTab = function(b, K) + local L = J(b, K)L:Formula409() + return L + end + end + if m.scrollbar then Ace3_ScrollStyle(m.scrollbar) end + end + return x(b, m) + end +end +--[[ +########################################################## +STYLE LOADING +########################################################## +]]-- +STYLE:SaveBlizzardStyle("SVUI_ConfigOMatic", StyleAce3) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua index 71da56a..36d6ac6 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua @@ -26,13 +26,15 @@ local SystemPopList = { "StaticPopup2", "StaticPopup3" }; -local SystemFrameList1 = { - "GameMenuFrame", - "TicketStatusFrameButton", +local SystemDropDownList = { "DropDownList1MenuBackdrop", "DropDownList2MenuBackdrop", "DropDownList1Backdrop", "DropDownList2Backdrop", +}; +local SystemFrameList1 = { + "GameMenuFrame", + "TicketStatusFrameButton", "AutoCompleteBox", "ConsolidatedBuffsTooltip", "ReadyCheckFrame", @@ -501,6 +503,13 @@ local function SystemPanelQue() this:SetBackdropColor(0.8, 0.2, 0.2) end end + for i = 1, #SystemDropDownList do + local this = _G[SystemDropDownList[i]] + if(this) then + this:Formula409() + this:SetPanelTemplate("Transparent") + end + end for i = 1, #SystemFrameList1 do local this = _G[SystemFrameList1[i]] if(this) then @@ -904,7 +913,6 @@ local function SystemPanelQue() local this = _G["InterfaceOptions"..SystemFrameList16[i]] if(this) then STYLE:ApplyDropdownStyle(this) - DropDownList1:SetFixedPanelTemplate("Default", true) end end InterfaceOptionsHelpPanelResetTutorials:SetButtonTemplate() @@ -918,7 +926,6 @@ local function SystemPanelQue() local this = _G[SystemFrameList18[i]] if(this) then STYLE:ApplyDropdownStyle(this,165) - DropDownList1:SetFixedPanelTemplate("Default", true) end end for i = 1, #SystemFrameList19 do diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Ace3.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Ace3.lua deleted file mode 100644 index 06f180e..0000000 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Ace3.lua +++ /dev/null @@ -1,309 +0,0 @@ ---[[ -############################################################################## -_____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_ # - ___/\\\/////////\\\_\/\\\_______\/\\\_\/\\\_______\/\\\_\/////\\\///__ # - __\//\\\______\///__\//\\\______/\\\__\/\\\_______\/\\\_____\/\\\_____ # - ___\////\\\__________\//\\\____/\\\___\/\\\_______\/\\\_____\/\\\_____ # - ______\////\\\________\//\\\__/\\\____\/\\\_______\/\\\_____\/\\\_____ # - _________\////\\\______\//\\\/\\\_____\/\\\_______\/\\\_____\/\\\_____ # - __/\\\______\//\\\______\//\\\\\______\//\\\______/\\\______\/\\\_____ # - _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_# - ___\///////////___________\///___________\/////////_____\///////////_# -############################################################################## -S U P E R - V I L L A I N - U I By: Munglunch # -############################################################################## ---]] -local SuperVillain, L = unpack(SVUI); - -local STYLE = _G.StyleVillain; -local AceGUI = LibStub("AceGUI-3.0", true); -local NOOP = function() end; -local function Ace3_OnEnter(b) - b:SetBackdropBorderColor(unpack(SuperVillain.Media.color.highlight)) -end; -local function Ace3_OnLeave(b) - b:SetBackdropBorderColor(0,0,0,1) -end; -local function Ace3_ScrollStyle(e, f) - if _G[e:GetName().."BG"]then - _G[e:GetName().."BG"]:SetTexture(nil) - end; - if _G[e:GetName().."Track"]then - _G[e:GetName().."Track"]:SetTexture(nil) - end; - if _G[e:GetName().."Top"]then - _G[e:GetName().."Top"]:SetTexture(nil) - _G[e:GetName().."Bottom"]:SetTexture(nil) - _G[e:GetName().."Middle"]:SetTexture(nil) - end; - if _G[e:GetName().."ScrollUpButton"] and _G[e:GetName().."ScrollDownButton"] then - _G[e:GetName().."ScrollUpButton"]:Formula409() - if not _G[e:GetName().."ScrollUpButton"].icon then - STYLE:ApplyPaginationStyle(_G[e:GetName().."ScrollUpButton"]) - SquareButton_SetIcon(_G[e:GetName().."ScrollUpButton"], "UP") - _G[e:GetName().."ScrollUpButton"]:Size(_G[e:GetName().."ScrollUpButton"]:GetWidth()+7, _G[e:GetName().."ScrollUpButton"]:GetHeight()+7) - end; - _G[e:GetName().."ScrollDownButton"]:Formula409() - if not _G[e:GetName().."ScrollDownButton"].icon then - STYLE:ApplyPaginationStyle(_G[e:GetName().."ScrollDownButton"]) - SquareButton_SetIcon(_G[e:GetName().."ScrollDownButton"], "DOWN") - _G[e:GetName().."ScrollDownButton"]:Size(_G[e:GetName().."ScrollDownButton"]:GetWidth()+7, _G[e:GetName().."ScrollDownButton"]:GetHeight()+7) - end; - if not e.styledBackground then - e.styledBackground = CreateFrame("Frame", nil, e) - e.styledBackground:Point("TOPLEFT", _G[e:GetName().."ScrollUpButton"], "BOTTOMLEFT", 0, -1) - e.styledBackground:Point("BOTTOMRIGHT", _G[e:GetName().."ScrollDownButton"], "TOPRIGHT", 0, 1) - e.styledBackground:SetPanelTemplate("Inset", true) - end; - if e:GetThumbTexture()then - if not f then - f = 3 - end; - e:GetThumbTexture():SetTexture("Interface\\Buttons\\UI-ScrollBar-Knob") - end - end -end; - -local function Ace3_ButtonStyle(h, i, j) - if h.Left then h.Left:SetAlpha(0)end; - if h.Middle then h.Middle:SetAlpha(0)end; - if h.Right then h.Right:SetAlpha(0)end; - if h.SetNormalTexture then h:SetNormalTexture("")end; - if h.SetHighlightTexture then h:SetHighlightTexture("")end; - if h.SetPushedTexture then h:SetPushedTexture("")end; - if h.SetDisabledTexture then h:SetDisabledTexture("")end; - if i then h:Formula409()end; - if not h.template and not j then h:SetFixedPanelTemplate("Button")end; - h:HookScript("OnEnter", Ace3_OnEnter)h:HookScript("OnLeave", Ace3_OnLeave) -end; - -local function Ace3_PaginationStyle(...) - STYLE:ApplyPaginationStyle(...) -end; - -local function StyleAce3() - local AceGUI = LibStub("AceGUI-3.0", true) - if not AceGUI then return end; - local savedFn = AceGUI.RegisterAsWidget; - AceGUI.RegisterAsWidget = function(b, m) - if not SuperVillain.db.SVStyle or not SuperVillain.db.SVStyle.addons.ace3 then - return savedFn(b, m) - end; - local n = m.type; - if n == "MultiLineEditBox"then - local e = m.frame; - e:SetFixedPanelTemplate("Pattern") - if not m.scrollBG.template then - m.scrollBG:SetFixedPanelTemplate("Inset") - end; - Ace3_ButtonStyle(m.button) - Ace3_ScrollStyle(m.scrollBar) - m.scrollBar:SetPoint("RIGHT", e, "RIGHT", 0-4) - m.scrollBG:SetPoint("TOPRIGHT", m.scrollBar, "TOPLEFT", -2, 19) - m.scrollBG:SetPoint("BOTTOMLEFT", m.button, "TOPLEFT") - m.scrollFrame:SetPoint("BOTTOMRIGHT", m.scrollBG, "BOTTOMRIGHT", -4, 8) - elseif n == "CheckBox"then - m.checkbg:MUNG()m.highlight:MUNG() - if not m.styledCheckBG then - m.styledCheckBG = CreateFrame("Frame", nil, m.frame) - m.styledCheckBG:FillInner(m.check) - m.styledCheckBG:SetFixedPanelTemplate("Inset") - end; - m.check:SetParent(m.styledCheckBG) - elseif n == "Dropdown"then - local e = m.dropdown; - local o = m.button; - local p = m.text; - e:Formula409() - o:ClearAllPoints() - o:Point("RIGHT", e, "RIGHT", -20, 0) - o:SetFrameLevel(o:GetFrameLevel() + 1) - Ace3_PaginationStyle(o, true) - if not e.Panel then - e:SetPanelTemplate("Inset") - e.Panel:Point("TOPLEFT", e, "TOPLEFT", 20, -2) - e.Panel:Point("BOTTOMRIGHT", e, "BOTTOMRIGHT", -20, 2) - local level = e:GetFrameLevel() - if(level > 0) then - e.Panel:SetFrameLevel(level - 1) - else - e.Panel:SetFrameLevel(0) - end - end; - o:SetParent(e.Panel) - p:SetParent(e.Panel) - o:HookScript("OnClick", function(s) - local b = s.obj; - b.pullout.frame:SetFixedPanelTemplate("Default") - end) - elseif n == "LSM30_Font" or n == "LSM30_Sound" or n == "LSM30_Border" or n == "LSM30_Background" or n == "LSM30_Statusbar" then - local e = m.frame; - local o = e.dropButton; - local p = e.text;e:Formula409() - Ace3_PaginationStyle(o, true) - e.text:ClearAllPoints() - e.text:Point("RIGHT", o, "LEFT", -2, 0) - o:ClearAllPoints() - o:Point("RIGHT", e, "RIGHT", -10, -6) - if not e.Panel then - e:SetFixedPanelTemplate("Inset") - if n == "LSM30_Font"then - e.Panel:Point("TOPLEFT", 20, -17) - elseif n == "LSM30_Sound"then - e.Panel:Point("TOPLEFT", 20, -17) - m.soundbutton:SetParent(e.Panel) - m.soundbutton:ClearAllPoints() - m.soundbutton:Point("LEFT", e.Panel, "LEFT", 2, 0) - elseif n == "LSM30_Statusbar"then - e.Panel:Point("TOPLEFT", 20, -17) - m.bar:SetParent(e.Panel) - m.bar:FillInner() - elseif n == "LSM30_Border"or n == "LSM30_Background"then - e.Panel:Point("TOPLEFT", 42, -16) - end; - e.Panel:Point("BOTTOMRIGHT", o, "BOTTOMRIGHT", 2, -2) - end; - o:SetParent(e.Panel) - p:SetParent(e.Panel) - o:HookScript("OnClick", function(s, o)local b = s.obj; - if(b.dropdown and not b.dropdown.Panel) then - local e = b.dropdown - e:SetPanelTemplate("Inset") - e.Panel:Point("TOPLEFT", e, "TOPLEFT", 20, -2) - e.Panel:Point("BOTTOMRIGHT", e, "BOTTOMRIGHT", -20, 2) - local level = e:GetFrameLevel() - if(level > 0) then - e.Panel:SetFrameLevel(level - 1) - else - e.Panel:SetFrameLevel(0) - end - end - end) - elseif n == "EditBox" then - local e = m.editbox; - local o = m.button; - _G[e:GetName().."Left"]:MUNG() - _G[e:GetName().."Middle"]:MUNG() - _G[e:GetName().."Right"]:MUNG() - e:Height(17) - e:SetFixedPanelTemplate("Inset") - local level = e:GetFrameLevel() - if(level > 0) then - e.Panel:SetFrameLevel(level - 1) - else - e.Panel:SetFrameLevel(0) - end - Ace3_ButtonStyle(o) - elseif n == "Button"then - local e = m.frame;Ace3_ButtonStyle(e, nil, true) - e:Formula409() - e:SetFixedPanelTemplate("Button", true) - e.Panel:FillInner() - m.text:SetParent(e.Panel) - elseif n == "Slider"then - local e = m.slider; - local t = m.editbox; - local u = m.lowtext; - local v = m.hightext; - local w = 20; - e:Formula409() - e:SetFixedPanelTemplate("Inset") - e:Height(w) - e:SetThumbTexture("Interface\\Buttons\\UI-ScrollBar-Knob") - e:GetThumbTexture():SetVertexColor(0.8, 0.8, 0.8) - t:SetFixedPanelTemplate("Inset") - t:Height(15) - t:Point("TOP", e, "BOTTOM", 0, -1) - u:SetPoint("TOPLEFT", e, "BOTTOMLEFT", 2, -2) - v:SetPoint("TOPRIGHT", e, "BOTTOMRIGHT", -2, -2) - end; - return savedFn(b, m) - end; - local x = AceGUI.RegisterAsContainer; - local y = false; - AceGUI.RegisterAsContainer = function(b, m) - if(not SuperVillain.db.SVStyle or not SuperVillain.db.SVStyle.addons or not SuperVillain.db.SVStyle.addons.ace3) then - return x(b, m) - end; - local n = m.type; - if n == "ScrollFrame" then - local e = m.scrollbar; - Ace3_ScrollStyle(e) - elseif n == "Window" then - local e = m.content:GetParent() - e:SetPanelTemplate("Halftone") - elseif n == "InlineGroup" or n == "TreeGroup" or n == "TabGroup" or n == "SimpleGroup" or n == "Frame" or n == "DropdownGroup" then - local e = m.content:GetParent() - if n == "Frame" then - e:Formula409() - for z = 1, e:GetNumChildren()do - local A = select(z, e:GetChildren()) - if A:GetObjectType() == "Button"and A:GetText() then - Ace3_ButtonStyle(A) - else - A:Formula409() - end - end - end; - if not m.treeframe then - if not y then - e:SetPanelTemplate("Halftone") - e.Panel:SetFrameLevel(0) - y = true - else - e:SetFixedPanelTemplate("Default") - end - end; - if m.treeframe then - m.treeframe:SetFixedPanelTemplate("Inset") - e:Point("TOPLEFT", m.treeframe, "TOPRIGHT", 1, 0) - local B = m.CreateButton;m.CreateButton = function(b) - local o = B(b)o.toggle:Formula409() - o.toggle.SetNormalTexture = NOOP; - o.toggle.SetPushedTexture = NOOP; - o.toggleText = o.toggle:CreateFontString(nil, "OVERLAY") - o.toggleText:SetFontTemplate(nil, 19) - o.toggleText:SetPoint("CENTER") - o.toggleText:SetText("+") - return o - end; - local C = m.RefreshTree;m.RefreshTree = function(b, D)C(b, D) - if not b.tree then return end; - local E = b.status or b.localstatus; - local F = E.groups; - local G = b.lines; - local H = b.buttons; - for z, I in pairs(G)do - local o = H[z] - if F[I.uniquevalue]and o then - o.toggleText:SetText("-") - elseif o then - o.toggleText:SetText("+") - end - end - end - end; - if n == "TabGroup" then - local J = m.CreateTab;m.CreateTab = function(b, K) - local L = J(b, K)L:Formula409() - return L - end - end; - if m.scrollbar then Ace3_ScrollStyle(m.scrollbar) end - end; - return x(b, m) - end -end; -if not AceGUI then - local h = CreateFrame("Frame") - h:RegisterEvent("ADDON_LOADED") - h:SetScript("OnEvent", function(b, M, N) - if LibStub("AceGUI-3.0", true) then - StyleAce3() - b:UnregisterEvent("ADDON_LOADED") - end - end) - return -end; - -STYLE:SaveBlizzardStyle('Ace3', StyleAce3, true) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AuctionLite.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AuctionLite.lua new file mode 100644 index 0000000..cd52cd9 --- /dev/null +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/AuctionLite.lua @@ -0,0 +1,85 @@ +--[[ +############################################################################## +_____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_ # + ___/\\\/////////\\\_\/\\\_______\/\\\_\/\\\_______\/\\\_\/////\\\///__ # + __\//\\\______\///__\//\\\______/\\\__\/\\\_______\/\\\_____\/\\\_____ # + ___\////\\\__________\//\\\____/\\\___\/\\\_______\/\\\_____\/\\\_____ # + ______\////\\\________\//\\\__/\\\____\/\\\_______\/\\\_____\/\\\_____ # + _________\////\\\______\//\\\/\\\_____\/\\\_______\/\\\_____\/\\\_____ # + __/\\\______\//\\\______\//\\\\\______\//\\\______/\\\______\/\\\_____ # + _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_# + ___\///////////___________\///___________\/////////_____\///////////_# +############################################################################## +S U P E R - V I L L A I N - U I By: Munglunch # +############################################################################## +########################################################## +LOCALIZED LUA FUNCTIONS +########################################################## +]]-- +--[[ GLOBALS ]]-- +local _G = _G; +local unpack = _G.unpack; +local select = _G.select; +local pairs = _G.pairs; +local string = _G.string; +--[[ STRING METHODS ]]-- +local format = string.format; +--[[ +########################################################## +GET ADDON DATA +########################################################## +]]-- +local SuperVillain, L = unpack(SVUI); +local STYLE = _G.StyleVillain +--[[ +########################################################## +AUCTIONLITE +########################################################## +]]-- +local function BGHelper(parent) + parent.bg = CreateFrame("Frame", nil, parent) + parent.bg:SetFixedPanelTemplate("Inset") + parent.bg:Point("TOPLEFT", parent, "TOPLEFT", 16, -103) + parent.bg:Point("BOTTOMRIGHT", AuctionFrame, "BOTTOMRIGHT", -8, 36) + parent.bg:SetFrameLevel(parent.bg:GetFrameLevel() - 1) +end + +local function StyleAuctionLite(event, ...) + if(not event or (event and event == 'PLAYER_ENTERING_WORLD')) then return; end + + BuyName:SetEditboxTemplate() + BuyQuantity:SetEditboxTemplate() + SellStacks:SetEditboxTemplate() + SellSize:SetEditboxTemplate() + SellBidPriceGold:SetEditboxTemplate() + SellBidPriceSilver:SetEditboxTemplate() + SellBidPriceCopper:SetEditboxTemplate() + SellBuyoutPriceGold:SetEditboxTemplate() + SellBuyoutPriceSilver:SetEditboxTemplate() + SellBuyoutPriceCopper:SetEditboxTemplate() + + BuySearchButton:SetButtonTemplate() + BuyBidButton:SetButtonTemplate() + BuyBuyoutButton:SetButtonTemplate() + BuyCancelSearchButton:SetButtonTemplate() + BuyCancelAuctionButton:SetButtonTemplate() + BuyScanButton:SetButtonTemplate() + SellCreateAuctionButton:SetButtonTemplate() + + STYLE:ApplyPaginationStyle(BuyAdvancedButton) + STYLE:ApplyPaginationStyle(SellRememberButton) + + STYLE:ApplyTabStyle(AuctionFrameTab4) + STYLE:ApplyTabStyle(AuctionFrameTab5) + + if(_G["AuctionFrameBuy"]) then + BGHelper(_G["AuctionFrameBuy"]) + end + if(_G["AuctionFrameSell"]) then + BGHelper(_G["AuctionFrameSell"]) + end + + STYLE:SafeEventRemoval("AuctionLite", event) +end + +STYLE:SaveAddonStyle("AuctionLite", StyleAuctionLite, false, false, "AUCTION_HOUSE_SHOW") \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TinyDPS.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TinyDPS.lua index b814e53..1341ba1 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TinyDPS.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/TinyDPS.lua @@ -4,11 +4,11 @@ _____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_ # ___/\\\/////////\\\_\/\\\_______\/\\\_\/\\\_______\/\\\_\/////\\\///__ # __\//\\\______\///__\//\\\______/\\\__\/\\\_______\/\\\_____\/\\\_____ # ___\////\\\__________\//\\\____/\\\___\/\\\_______\/\\\_____\/\\\_____ # - ______\////\\\________\//\\\__/\\\____\/\\\_______\/\\\_____\/\\\_____ # - _________\////\\\______\//\\\/\\\_____\/\\\_______\/\\\_____\/\\\_____ # - __/\\\______\//\\\______\//\\\\\______\//\\\______/\\\______\/\\\_____ # - _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_# - ___\///////////___________\///___________\/////////_____\///////////_# + ______\////\\\________\//\\\__/\\\____\/\\\_______\/\\\_____\/\\\_____ # + _________\////\\\______\//\\\/\\\_____\/\\\_______\/\\\_____\/\\\_____ # + __/\\\______\//\\\______\//\\\\\______\//\\\______/\\\______\/\\\_____ # + _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_# + ___\///////////___________\///___________\/////////_____\///////////_# ############################################################################## S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## @@ -38,33 +38,31 @@ TINYDPS ########################################################## ]]-- local function StyleTinyDPS() - STYLE:ApplyFrameStyle(tdpsFrame) - - tdpsFrame:HookScript('OnShow', function() - if InCombatLockdown() then return end; - if DOCK.CurrentlyDocked["tdpsFrame"] then - SuperDockWindow:Show() - end - end) - - if tdpsStatusBar then - tdpsStatusBar:SetBackdrop({bgFile = [[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]], edgeFile = S.Blank, tile = false, tileSize = 0, edgeSize = 1}) - tdpsStatusBar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) - end - tdpsRefresh() + STYLE:ApplyFrameStyle(tdpsFrame) + tdpsFrame:HookScript("OnShow", function() + if InCombatLockdown() then return end; + if DOCK.CurrentlyDocked["tdpsFrame"] then + SuperDockWindowRight:Show() + end + end) + if tdpsStatusBar then + tdpsStatusBar:SetBackdrop({bgFile = [[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]], edgeFile = S.Blank, tile = false, tileSize = 0, edgeSize = 1}) + tdpsStatusBar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) + end + tdpsRefresh() end STYLE:SaveAddonStyle("TinyDPS", StyleTinyDPS) function STYLE:Docklet_TinyDPS(parent) - if not tdpsFrame then return end; - tdpsFrame:SetFixedPanelTemplate('Transparent',true) - tdpsFrame:SetFrameStrata('LOW') - tdps.hideOOC=false; - tdps.hideIC=false; - tdps.hideSolo=false; - tdps.hidePvP=false; - tdpsFrame:ClearAllPoints() - tdpsFrame:SetAllPoints(parent) - tdpsRefresh() -end; \ No newline at end of file + if not tdpsFrame then return end; + tdpsFrame:SetFixedPanelTemplate("Transparent", true) + tdpsFrame:SetFrameStrata("LOW") + tdps.hideOOC = false; + tdps.hideIC = false; + tdps.hideSolo = false; + tdps.hidePvP = false; + tdpsFrame:ClearAllPoints() + tdpsFrame:SetAllPoints(parent) + tdpsRefresh() +end \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/_load.xml b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/_load.xml index 4bf053f..aff4b42 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/_load.xml +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/_load.xml @@ -1,7 +1,7 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/"> - <Script file='Ace3.lua'/> <Script file='ACP.lua'/> <Script file='AtlasLoot.lua'/> + <Script file='AuctionLite.lua'/> <Script file='alDamageMeter.lua'/> <Script file='BigWigs.lua'/> <Script file='Clique.lua'/> diff --git a/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua b/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua index 760708a..b8a9f5f 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua @@ -175,7 +175,38 @@ function STYLE:ApplyScrollbarStyle(this) this.appliedStyle = true end -function STYLE:ApplyTabStyle(this) +local function TabHelper(this) + this:Formula409() + this:GetNormalTexture():SetTexCoord(0.1, 0.9, 0.1, 0.9) + this:GetNormalTexture():FillInner() + this.pushed = true; + this.backdrop = CreateFrame("Frame", nil, this) + this.backdrop:WrapOuter(this,1,1) + local level = this:GetFrameLevel() + if(level > 0) then + this.backdrop:SetFrameLevel(level - 1) + else + this.backdrop:SetFrameLevel(0) + end + this.backdrop:SetFixedPanelTemplate("Component", true) + this.backdrop:SetPanelColor("dark") + this:HookScript("OnEnter",Tab_OnEnter) + this:HookScript("OnLeave",Tab_OnLeave) + hooksecurefunc(this:GetHighlightTexture(), "SetTexture", function(i, w) + if w ~= nil then + i:SetTexture(nil) + end + end) + hooksecurefunc(this:GetCheckedTexture(), "SetTexture", function(i, w) + if w ~= nil then + i:SetTexture(nil) + end + end) + local a,b,c,d,e = this:GetPoint() + this:Point(a,b,c,1,e) +end; + +function STYLE:ApplyTabStyle(this, full) if(not this or (this and this.appliedStyle)) then return end local tab = this:GetName(); @@ -190,7 +221,11 @@ function STYLE:ApplyTabStyle(this) this:GetHighlightTexture():SetTexture(nil) else this:Formula409() - end + end + + if(full) then + TabHelper(this) + end local text = _G[tab.."Text"] this.backdrop = CreateFrame("Frame", nil, this) diff --git a/Interface/BUTTONS/Thumbs.db b/Interface/BUTTONS/Thumbs.db new file mode 100644 index 0000000..9a524d6 Binary files /dev/null and b/Interface/BUTTONS/Thumbs.db differ diff --git a/Interface/GLUES/COMMON/Thumbs.db b/Interface/GLUES/COMMON/Thumbs.db new file mode 100644 index 0000000..f45b1b0 Binary files /dev/null and b/Interface/GLUES/COMMON/Thumbs.db differ diff --git a/Interface/OPTIONSFRAME/OptionsFrameTab-Active.blp b/Interface/OPTIONSFRAME/OptionsFrameTab-Active.blp new file mode 100644 index 0000000..47c46cc Binary files /dev/null and b/Interface/OPTIONSFRAME/OptionsFrameTab-Active.blp differ diff --git a/Interface/PaperDollInfoFrame/UI-Character-ActiveTab.blp b/Interface/PaperDollInfoFrame/UI-Character-ActiveTab.blp new file mode 100644 index 0000000..79fe38f Binary files /dev/null and b/Interface/PaperDollInfoFrame/UI-Character-ActiveTab.blp differ diff --git a/Interface/PaperDollInfoFrame/UI-Character-InActiveTab.blp b/Interface/PaperDollInfoFrame/UI-Character-InActiveTab.blp new file mode 100644 index 0000000..8448d5b Binary files /dev/null and b/Interface/PaperDollInfoFrame/UI-Character-InActiveTab.blp differ diff --git a/Interface/PaperDollInfoFrame/UI-Character-Tab-Highlight-yellow.blp b/Interface/PaperDollInfoFrame/UI-Character-Tab-Highlight-yellow.blp new file mode 100644 index 0000000..55d5b7b Binary files /dev/null and b/Interface/PaperDollInfoFrame/UI-Character-Tab-Highlight-yellow.blp differ diff --git a/Interface/PaperDollInfoFrame/UI-Character-Tab-Highlight.blp b/Interface/PaperDollInfoFrame/UI-Character-Tab-Highlight.blp new file mode 100644 index 0000000..7e47d3b Binary files /dev/null and b/Interface/PaperDollInfoFrame/UI-Character-Tab-Highlight.blp differ diff --git a/Interface/PaperDollInfoFrame/UI-Character-Tab-RealHighlight.blp b/Interface/PaperDollInfoFrame/UI-Character-Tab-RealHighlight.blp new file mode 100644 index 0000000..34121c1 Binary files /dev/null and b/Interface/PaperDollInfoFrame/UI-Character-Tab-RealHighlight.blp differ diff --git a/Interface/TAXIFRAME/Thumbs.db b/Interface/TAXIFRAME/Thumbs.db new file mode 100644 index 0000000..544aded Binary files /dev/null and b/Interface/TAXIFRAME/Thumbs.db differ diff --git a/Interface/Tooltips/Thumbs.db b/Interface/Tooltips/Thumbs.db new file mode 100644 index 0000000..60da366 Binary files /dev/null and b/Interface/Tooltips/Thumbs.db differ