diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua index 71f1a89..d12aa4d 100644 --- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua +++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua @@ -287,15 +287,7 @@ local SlotUpdate = function(self, slotID) else SetItemButtonTextureVertexColor(slot, 1, 1, 1) end - - if(bagType) then - local r, g, b = bagType[1], bagType[2], bagType[3]; - slot:SetBackdropColor(r, g, b, 0.6) - slot:SetBackdropBorderColor(r, g, b, 1) - else - slot:SetBackdropColor(0, 0, 0, 0.6) - slot:SetBackdropBorderColor(0, 0, 0, 1) - end + if(itemLink) then local rarity = select(3, GetItemInfo(itemLink)) if(rarity and rarity > 1) then @@ -306,6 +298,13 @@ local SlotUpdate = function(self, slotID) slot:SetBackdropColor(0, 0, 0, 0.6) slot:SetBackdropBorderColor(0, 0, 0, 1) end + elseif(bagType) then + local r, g, b = bagType[1], bagType[2], bagType[3]; + slot:SetBackdropColor(r, g, b, 0.6) + slot:SetBackdropBorderColor(r, g, b, 1) + else + slot:SetBackdropColor(0, 0, 0, 0.6) + slot:SetBackdropBorderColor(0, 0, 0, 1) end if(C_NewItems.IsNewItem(bag, slotID)) then @@ -1199,6 +1198,7 @@ do function MOD:MakeBags() local bagName = "SVUI_ContainerFrame" + local uisCount = #UISpecialFrames + 1; local bagsCount = #self.BagFrames + 1; local frame = CreateFrame("Button", "SVUI_ContainerFrame", SV.UIParent) @@ -1375,7 +1375,8 @@ do end frame:SetScript("OnHide", CloseAllBags) - SV:AddToDisplayAudit(frame) + UISpecialFrames[uisCount] = bagName; + --SV:AddToDisplayAudit(frame) self.BagFrames[bagsCount] = frame self.BagFrame = frame @@ -1385,6 +1386,7 @@ do -- Reagent Slots: 1 - 98 -- /script print(ReagentBankFrameItem1:GetInventorySlot()) local bagName = isReagent and "SVUI_ReagentContainerFrame" or "SVUI_BankContainerFrame" + local uisCount = #UISpecialFrames + 1; local bagsCount = #self.BagFrames + 1; local frame = CreateFrame("Button", bagName, isReagent and self.BankFrame or SV.UIParent) @@ -1479,7 +1481,8 @@ do local Transfer_OnClick = MOD:RunSortingProcess(MOD.Transfer, "bank bags") frame.transferButton:SetScript("OnClick", Transfer_OnClick) - SV:AddToDisplayAudit(frame) + UISpecialFrames[uisCount] = bagName; + --SV:AddToDisplayAudit(frame) self.BagFrames[bagsCount] = frame frame.bagsButton = CreateFrame("Button", nil, frame) diff --git a/Interface/AddOns/SVUI/scripts/ego.lua b/Interface/AddOns/SVUI/scripts/ego.lua index 5b6a9fa..4cebace 100644 --- a/Interface/AddOns/SVUI/scripts/ego.lua +++ b/Interface/AddOns/SVUI/scripts/ego.lua @@ -33,88 +33,66 @@ local L = SV.L local Sequences = { {65, 1000}, --shrug - {68, 1000}, --cheer {70, 1000}, --laugh {74, 1000}, --roar - {77, 1000}, --cry - {84, 1000}, --point {82, 1000}, --flex }; -local EgoFrame = CreateFrame("PlayerModel", "SVUI_EgoModel", UIParent); - local function rng() return random(1, #Sequences) end -local LaunchAnimation = function(self, key) +local GoGoGadget = function(self, key) key = key or rng() local emote = Sequences[key][1] - self:Show() - self:SetAnimation(emote) - self.anim:Play() + self:SetAlpha(1) + self.Model1:SetAnimation(emote) + self.Model2:SetAnimation(emote) end -local LaunchFreezeFrame = function(self, key) - key = key or rng() - local animation = Sequences[key] - local size = SVUIParent:GetHeight() - self:Show() - self:SetSequenceTime(unpack(animation)) - self.anim[2]:SetOffset(size, -size) - self.anim[2]:SetOffset(0, 0) - self.anim:Play() -end +local function LoadSVEgo() + local GameMenuFrame = _G.GameMenuFrame -local ResetPosition = function(self) - local size = SVUIParent:GetHeight() - self:SetPoint("TOP", SV.UIParent, "TOP", 0, 0) - self:SetWidth(size) - self:SetHeight(size) - self:SetUnit("player") -end + local EgoFrame = CreateFrame("Frame", "SVUI_EgoFrame", UIParent); + EgoFrame:SetParent(GameMenuFrame) + EgoFrame:SetFrameLevel(0) + EgoFrame:SetAllPoints(SV.UIParent) -local Ego_OnEvent = function(self, event) - if event == "ACHIEVEMENT_EARNED" then - self:LaunchAnimation(4) - else - self:LaunchAnimation(6) - end -end + EgoFrame.BG1 = EgoFrame:CreateTexture(nil, "BACKGROUND", nil, -7) + EgoFrame.BG1:SetPoint("TOPLEFT", EgoFrame, "TOPLEFT", 0, 0) + EgoFrame.BG1:SetPoint("BOTTOMRIGHT", EgoFrame, "TOPRIGHT", 0, -300) + EgoFrame.BG1:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) + EgoFrame.BG1:SetVertexColor(0, 0, 0, 0.8) -function SV:ToggleEgo() - if not SV.db.general.ego then - EgoFrame:UnregisterEvent("ACHIEVEMENT_EARNED") - EgoFrame:UnregisterEvent("SCREENSHOT_SUCCEEDED") - EgoFrame:SetScript("OnEvent", nil) - else - EgoFrame:RegisterEvent("ACHIEVEMENT_EARNED") - EgoFrame:RegisterEvent("SCREENSHOT_SUCCEEDED") - EgoFrame:SetScript("OnEvent", Ego_OnEvent) - end -end + EgoFrame.BG2 = EgoFrame:CreateTexture(nil, "BACKGROUND", nil, -7) + EgoFrame.BG2:SetPoint("BOTTOMLEFT", EgoFrame, "BOTTOMLEFT", 0, 0) + EgoFrame.BG2:SetPoint("TOPRIGHT", EgoFrame, "BOTTOMRIGHT", 0, 300) + EgoFrame.BG2:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) + EgoFrame.BG2:SetVertexColor(0, 0, 0, 0.8) -local EgoPop_OnUpdate = function(self) self.parent:SetAlpha(0) end + EgoFrame.Model1 = CreateFrame("PlayerModel", "SVUI_EgoModel1", EgoFrame); + EgoFrame.Model1:SetUnit("player") + EgoFrame.Model1:SetRotation(1) + EgoFrame.Model1:SetPortraitZoom(0.3) + EgoFrame.Model1:SetPosition(0,0,-0.25) + EgoFrame.Model1:SetFrameStrata("BACKGROUND") + EgoFrame.Model1:SetPoint("TOPLEFT", EgoFrame, "TOPLEFT", -250, -300) + EgoFrame.Model1:SetPoint("BOTTOMRIGHT", EgoFrame, "BOTTOM", 0, 300) -local function LoadSVEgo() - local size = UIParent:GetWidth() - EgoFrame:SetParent(SV.UIParent) - EgoFrame:SetPoint("TOP", SV.UIParent, "TOP", 0, 0) - EgoFrame:SetWidth(size) - EgoFrame:SetHeight(size) - EgoFrame:SetUnit("player") - EgoFrame.LaunchAnimation = LaunchAnimation - EgoFrame.LaunchFreezeFrame = LaunchFreezeFrame - EgoFrame.ResetPosition = ResetPosition - SV.Animate:Slide(EgoFrame, 0, 0, true, 1.5) - EgoFrame.anim[4]:SetScript("OnFinished", EgoPop_OnUpdate) + EgoFrame.Model2 = CreateFrame("PlayerModel", "SVUI_EgoModel2", EgoFrame); + EgoFrame.Model2:SetUnit("player") + EgoFrame.Model2:SetRotation(-1) + EgoFrame.Model2:SetPortraitZoom(0.3) + EgoFrame.Model2:SetPosition(0,0,-0.25) + EgoFrame.Model2:SetFrameStrata("BACKGROUND") + EgoFrame.Model2:SetPoint("TOPRIGHT", EgoFrame, "TOPRIGHT", 250, -300) + EgoFrame.Model2:SetPoint("BOTTOMLEFT", EgoFrame, "BOTTOM", 250, 300) - EgoFrame:Hide() -end + EgoFrame.GoGoGadget = GoGoGadget -_G.SlashCmdList["BADASS"] = function() - EgoFrame:LaunchAnimation(4) + EgoFrame:SetScript("OnShow", function(self) + self:GoGoGadget() + end) end -_G.SLASH_BADASS1 = "/badass" SV:NewScript(LoadSVEgo) \ No newline at end of file diff --git a/Interface/AddOns/SVUI/system/alerts.lua b/Interface/AddOns/SVUI/system/alerts.lua index a1228e1..c265e29 100644 --- a/Interface/AddOns/SVUI/system/alerts.lua +++ b/Interface/AddOns/SVUI/system/alerts.lua @@ -150,9 +150,11 @@ SV.SystemAlert["CONFIRM_BUY_REAGENTBANK_TAB"] = { OnShow = function(self) MoneyFrame_Update(self.moneyFrame, GetReagentBankCost()); if(_G["SVUI_ReagentContainerFrame"]) then - _G["SVUI_ReagentContainerFrame"].swapButton:SetNormalTexture([[Interface\AddOns\SVUI\assets\artwork\Icons\BAGS-REAGENTS]]) _G["SVUI_ReagentContainerFrame"]:UpdateLayout() _G["SVUI_ReagentContainerFrame"]:Show() + if(_G["SVUI_ReagentContainerFrame"].swapButton) then + _G["SVUI_ReagentContainerFrame"].swapButton:SetNormalTexture([[Interface\AddOns\SVUI\assets\artwork\Icons\BAGS-REAGENTS]]) + end end end, hasMoneyFrame = 1, diff --git a/Interface/AddOns/SVUI/xml/widgets.xml b/Interface/AddOns/SVUI/xml/widgets.xml index 4acae67..4691e33 100644 --- a/Interface/AddOns/SVUI/xml/widgets.xml +++ b/Interface/AddOns/SVUI/xml/widgets.xml @@ -269,31 +269,133 @@ </Frames> </Frame> - <Frame name="SVUI_PanelTemplate_FramedTop" inherits="SVUI_PanelTemplate_Default" virtual="true"> + <Frame name="SVUI_PanelTemplate_FramedTop" virtual="true"> <Attributes> <Attribute name="panelColor" type="string" value="default" /> <Attribute name="panelGradient" type="string" value="darkest2" /> <Attribute name="panelTexUpdate" type="boolean" value="true" /> + <Attribute name="panelPadding" type="number" value="1" /> + <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\SVUI\assets\artwork\Template\DEFAULT2" 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> </Frame> - <Frame name="SVUI_PanelTemplate_FramedBottom" inherits="SVUI_PanelTemplate_Default" virtual="true"> + <Frame name="SVUI_PanelTemplate_FramedBottom" virtual="true"> <Attributes> <Attribute name="panelColor" type="string" value="default" /> <Attribute name="panelGradient" type="string" value="darkest" /> <Attribute name="panelTexUpdate" type="boolean" value="true" /> + <Attribute name="panelPadding" type="number" value="1" /> + <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\SVUI\assets\artwork\Template\DEFAULT" 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> </Frame> diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petjournal.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petjournal.lua index 7695f78..b368c05 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petjournal.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petjournal.lua @@ -96,7 +96,6 @@ FRAME STYLER ########################################################## ]]-- local function PetJournalStyle() - STYLE.Debugging = true if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.mounts ~= true then return end STYLE:ApplyWindowStyle(PetJournalParent) diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/voidstorage.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/voidstorage.lua index 629092b..56a8d13 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/voidstorage.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/voidstorage.lua @@ -39,12 +39,59 @@ local VoidStorageList = { "VoidStoragePurchaseFrame", "VoidItemSearchBox" }; + +local function Tab_OnEnter(this) + this.backdrop:SetBackdropColor(0.1, 0.8, 0.8) + this.backdrop:SetBackdropBorderColor(0.1, 0.8, 0.8) +end + +local function Tab_OnLeave(this) + this.backdrop:SetBackdropColor(0,0,0,1) + this.backdrop:SetBackdropBorderColor(0,0,0,1) +end + +local function ChangeTabHelper(this) + this:RemoveTextures() + local nTex = this:GetNormalTexture() + if(nTex) then + nTex:SetTexture([[Interface\ICONS\INV_Enchant_VoidSphere]]) + nTex:SetTexCoord(0.1, 0.9, 0.1, 0.9) + nTex:FillInner() + end + + this.pushed = true; + + this.backdrop = CreateFrame("Frame", nil, this) + this.backdrop:WrapOuter(this,1,1) + this.backdrop:SetFrameLevel(0) + this.backdrop:SetBackdrop({ + bgFile = [[Interface\BUTTONS\WHITE8X8]], + tile = false, + tileSize = 0, + edgeFile = [[Interface\AddOns\SVUI\assets\artwork\Template\GLOW]], + edgeSize = 3, + insets = { + left = 0, + right = 0, + top = 0, + bottom = 0 + } + }); + this.backdrop:SetBackdropColor(0,0,0,1) + this.backdrop:SetBackdropBorderColor(0,0,0,1) + this:SetScript("OnEnter", Tab_OnEnter) + this:SetScript("OnLeave", Tab_OnLeave) + + local a,b,c,d,e = this:GetPoint() + this:Point(a,b,c,1,e) +end --[[ ########################################################## VOIDSTORAGE STYLER ########################################################## ]]-- local function VoidStorageStyle() + STYLE.Debugging = true if SV.db[Schema].blizzard.enable ~= true or SV.db[Schema].blizzard.voidstorage ~= true then return end @@ -89,10 +136,13 @@ local function VoidStorageStyle() local j = _G["VoidStorageStorageButton"..e] local k = _G["VoidStorageStorageButton"..e.."IconTexture"] _G["VoidStorageStorageButton"..e.."Bg"]:Hide() - j:SetSlotTemplate(true) + j:SetSlotTemplate(true, 2, 0, 0) k:SetTexCoord(0.1, 0.9, 0.1, 0.9) k:FillInner() - end + end + + ChangeTabHelper(VoidStorageFrame.Page1) + ChangeTabHelper(VoidStorageFrame.Page2) end --[[ ########################################################## diff --git a/Interface/BUTTONS/UI-CheckBox-Check-Disabled.blp b/Interface/BUTTONS/UI-CheckBox-Check-Disabled.blp index 6723c5e..063ecb7 100644 Binary files a/Interface/BUTTONS/UI-CheckBox-Check-Disabled.blp and b/Interface/BUTTONS/UI-CheckBox-Check-Disabled.blp differ diff --git a/Interface/BUTTONS/UI-CheckBox-Check.blp b/Interface/BUTTONS/UI-CheckBox-Check.blp index c4a6afc..de74f92 100644 Binary files a/Interface/BUTTONS/UI-CheckBox-Check.blp and b/Interface/BUTTONS/UI-CheckBox-Check.blp differ