diff --git a/SVUI_!Core/system/layout.lua b/SVUI_!Core/system/layout.lua index fa0aa61..f714dc3 100644 --- a/SVUI_!Core/system/layout.lua +++ b/SVUI_!Core/system/layout.lua @@ -964,10 +964,11 @@ end local function SaveCurrentPosition(frame) if not frame then return end + local result; local frameName = frame:GetName() local anchor1, parent, anchor2, x, y = frame:GetPoint() if((not anchor1) or (not anchor2) or (not x) or (not y)) then - Dragger.Frames[frameName] = "TBD"; + result = "TBD"; else local parentName if(not parent or (parent and (not parent:GetName()))) then @@ -975,7 +976,13 @@ local function SaveCurrentPosition(frame) else parentName = parent:GetName() end - Dragger.Frames[frameName] = ("%s|%s|%s|%d|%d"):format(anchor1, parentName, anchor2, parsefloat(x), parsefloat(y)) + result = ("%s|%s|%s|%d|%d"):format(anchor1, parentName, anchor2, parsefloat(x), parsefloat(y)) + end + if(SV.db.general.saveDraggable) then + SV.private.Draggables[frameName] = result + Dragger.Frames = SV.private.Draggables + else + Dragger.Frames[frameName] = result end end @@ -1267,11 +1274,11 @@ local function InitializeMovables() Layout:Update() + if(not SV.private.Draggables) then SV.private.Draggables = {} end + if(SV.db.general.saveDraggable) then - SV.private.Draggables = SV.private.Draggables or {} Dragger.Frames = SV.private.Draggables else - SV.private.Draggables = {} Dragger.Frames = {} end diff --git a/SVUI_Skins/components/blizzard/_load.xml b/SVUI_Skins/components/blizzard/_load.xml index 887f4b3..9357ea6 100644 --- a/SVUI_Skins/components/blizzard/_load.xml +++ b/SVUI_Skins/components/blizzard/_load.xml @@ -20,11 +20,9 @@ <Script file='itemupgrade.lua'/> <Script file='keybinding.lua'/> <Script file='lfd.lua'/> - <Script file='lossofcontrol.lua'/> <Script file='macro.lua'/> <Script file='petbattle.lua'/> <Script file='petjournal.lua'/> - <Script file='petstable.lua'/> <Script file='pvp.lua'/> <Script file='quest.lua'/> <Script file='raid.lua'/> diff --git a/SVUI_Skins/components/blizzard/dressup.lua b/SVUI_Skins/components/blizzard/dressup.lua deleted file mode 100644 index 49f70b6..0000000 --- a/SVUI_Skins/components/blizzard/dressup.lua +++ /dev/null @@ -1,47 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -DRESSUP MODR -########################################################## -]]-- -local function DressUpStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.dressingroom ~= true then - return - end - - DressUpFrame:ModSize(500, 600) - SV.API:Set("Window", DressUpFrame, true, true) - - DressUpModel:ClearAllPoints() - DressUpModel:ModPoint("TOPLEFT", DressUpFrame, "TOPLEFT", 12, -76) - DressUpModel:ModPoint("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 36) - - DressUpModel:SetStyle("!_Frame", "Model") - - DressUpFrameCancelButton:ModPoint("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 12) - DressUpFrameCancelButton:SetStyle("Button") - - DressUpFrameResetButton:ModPoint("RIGHT", DressUpFrameCancelButton, "LEFT", -12, 0) - DressUpFrameResetButton:SetStyle("Button") - - SV.API:Set("CloseButton", DressUpFrameCloseButton, DressUpFrame.Panel) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(DressUpStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/gossip.lua b/SVUI_Skins/components/blizzard/gossip.lua deleted file mode 100644 index 3991830..0000000 --- a/SVUI_Skins/components/blizzard/gossip.lua +++ /dev/null @@ -1,75 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; -local ipairs = _G.ipairs; -local pairs = _G.pairs; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -GOSSIP MODR -########################################################## -]]-- -local function GossipStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.gossip ~= true then return end - - SV.API:Set("Window", GossipFrame, true, true) - - ItemTextFrame:RemoveTextures(true) - ItemTextScrollFrame:RemoveTextures() - SV.API:Set("CloseButton", GossipFrameCloseButton) - SV.API:Set("PageButton", ItemTextPrevPageButton) - SV.API:Set("PageButton", ItemTextNextPageButton) - ItemTextPageText:SetTextColor(1, 1, 1) - hooksecurefunc(ItemTextPageText, "SetTextColor", function(q, k, l, m) - if k ~= 1 or l ~= 1 or m ~= 1 then - ItemTextPageText:SetTextColor(1, 1, 1) - end - end) - ItemTextFrame:SetStyle("Frame", "Pattern") - ItemTextFrameInset:Die() - SV.API:Set("ScrollFrame", ItemTextScrollFrameScrollBar) - SV.API:Set("CloseButton", ItemTextFrameCloseButton) - local r = {"GossipFrameGreetingPanel", "GossipFrameInset", "GossipGreetingScrollFrame"} - SV.API:Set("ScrollFrame", GossipGreetingScrollFrameScrollBar, 5) - for s, t in pairs(r)do - _G[t]:RemoveTextures() - end - GossipFrame:SetStyle("Frame", "Window") - GossipGreetingScrollFrame:SetStyle("!_Frame", "Inset", true) - GossipGreetingScrollFrame.spellTex = GossipGreetingScrollFrame:CreateTexture(nil, "ARTWORK") - GossipGreetingScrollFrame.spellTex:SetTexture([[Interface\QuestFrame\QuestBG]]) - GossipGreetingScrollFrame.spellTex:SetPoint("TOPLEFT", 2, -2) - GossipGreetingScrollFrame.spellTex:ModSize(506, 615) - GossipGreetingScrollFrame.spellTex:SetTexCoord(0, 1, 0.02, 1) - _G["GossipFramePortrait"]:Die() - _G["GossipFrameGreetingGoodbyeButton"]:RemoveTextures() - _G["GossipFrameGreetingGoodbyeButton"]:SetStyle("Button") - SV.API:Set("CloseButton", GossipFrameCloseButton, GossipFrame.Panel) - - NPCFriendshipStatusBar:RemoveTextures() - NPCFriendshipStatusBar:SetStatusBarTexture(SV.media.statusbar.default) - NPCFriendshipStatusBar:SetStyle("Frame", "Bar") - - NPCFriendshipStatusBar:ClearAllPoints() - NPCFriendshipStatusBar:SetPoint("TOPLEFT", GossipFrame, "TOPLEFT", 58, -34) - - NPCFriendshipStatusBar.icon:ModSize(32,32) - NPCFriendshipStatusBar.icon:ClearAllPoints() - NPCFriendshipStatusBar.icon:SetPoint("RIGHT", NPCFriendshipStatusBar, "LEFT", 0, -2) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(GossipStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/loothistory.lua b/SVUI_Skins/components/blizzard/loothistory.lua deleted file mode 100644 index 72b197a..0000000 --- a/SVUI_Skins/components/blizzard/loothistory.lua +++ /dev/null @@ -1,150 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; -local math = _G.math; ---[[ MATH METHODS ]]-- -local ceil = math.ceil; -- Basic ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -HELPERS -########################################################## -]]-- -local MissingLootFrame_OnShow = function(self) - local numMissing = GetNumMissingLootItems() - for i = 1, numMissing do - local slot = _G["MissingLootFrameItem"..i] - local icon = slot.icon; - SV.API:Set("ItemButton", slot, true) - local texture, name, count, quality = GetMissingLootItemInfo(i); - local r,g,b,hex = GetItemQualityColor(quality) - if(not r) then - r,g,b = 0,0,0 - end - icon:SetTexture(texture) - _G.MissingLootFrame:SetBackdropBorderColor(r,g,b) - end - local calc = (ceil(numMissing * 0.5) * 43) + 38 - _G.MissingLootFrame:SetHeight(calc + _G.MissingLootFrameLabel:GetHeight()) -end - -local LootHistoryFrame_OnUpdate = function(self) - local numItems = _G.C_LootHistory.GetNumItems() - for i = 1, numItems do - local frame = _G.LootHistoryFrame.itemFrames[i] - if not frame.isStyled then - local Icon = frame.Icon:GetTexture() - frame:RemoveTextures() - frame.Icon:SetTexture(Icon) - frame.Icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - - frame:SetStyle("!_Frame", "Button") - frame.Panel:WrapPoints(frame.Icon) - frame.Icon:SetParent(frame.Panel) - - frame.isStyled = true - end - end -end - -local _hook_MasterLootFrame_OnShow = function() - local MasterLooterFrame = _G.MasterLooterFrame; - local item = MasterLooterFrame.Item; - local LootFrame = _G.LootFrame; - if item then - local icon = item.Icon; - local tex = icon:GetTexture() - local colors = ITEM_QUALITY_COLORS[LootFrame.selectedQuality] - item:RemoveTextures() - icon:SetTexture(tex) - icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - item:SetStyle("Frame", "Pattern") - item.Panel:WrapPoints(icon) - item:SetBackdropBorderColor(colors.r, colors.g, colors.b) - end - for i = 1, MasterLooterFrame:GetNumChildren()do - local child = select(i, MasterLooterFrame:GetChildren()) - if child and not child.isStyled and not child:GetName() then - if child:GetObjectType() == "Button" then - if child:GetPushedTexture() then - SV.API:Set("CloseButton", child) - else - child:SetStyle("!_Frame") - child:SetStyle("Button") - end - child.isStyled = true - end - end - end -end ---[[ -########################################################## -LOOTHISTORY MODR -########################################################## -]]-- -local function LootHistoryStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.loot ~= true then return end - - local MasterLooterFrame = _G.MasterLooterFrame; - local MissingLootFrame = _G.MissingLootFrame; - local LootHistoryFrame = _G.LootHistoryFrame; - local BonusRollFrame = _G.BonusRollFrame; - local MissingLootFramePassButton = _G.MissingLootFramePassButton; - - LootHistoryFrame:SetFrameStrata('HIGH') - - MissingLootFrame:RemoveTextures() - MissingLootFrame:SetStyle("Frame", "Pattern") - - SV.API:Set("CloseButton", MissingLootFramePassButton) - hooksecurefunc("MissingLootFrame_Show", MissingLootFrame_OnShow) - LootHistoryFrame:RemoveTextures() - SV.API:Set("CloseButton", LootHistoryFrame.CloseButton) - LootHistoryFrame:RemoveTextures() - LootHistoryFrame:SetStyle("!_Frame", 'Transparent') - SV.API:Set("CloseButton", LootHistoryFrame.ResizeButton) - LootHistoryFrame.ResizeButton:SetStyle("!_Frame") - LootHistoryFrame.ResizeButton:ModWidth(LootHistoryFrame:GetWidth()) - LootHistoryFrame.ResizeButton:ModHeight(19) - LootHistoryFrame.ResizeButton:ClearAllPoints() - LootHistoryFrame.ResizeButton:ModPoint("TOP", LootHistoryFrame, "BOTTOM", 0, -2) - LootHistoryFrame.ResizeButton:SetNormalTexture("") - - local txt = LootHistoryFrame.ResizeButton:CreateFontString(nil,"OVERLAY") - txt:SetFont(SV.media.font.default, 14, "NONE") - txt:SetAllPoints(LootHistoryFrame.ResizeButton) - txt:SetJustifyH("CENTER") - txt:SetText("RESIZE") - - LootHistoryFrameScrollFrame:RemoveTextures() - SV.API:Set("ScrollFrame", LootHistoryFrameScrollFrameScrollBar) - hooksecurefunc("LootHistoryFrame_FullUpdate", LootHistoryFrame_OnUpdate) - - MasterLooterFrame:RemoveTextures() - MasterLooterFrame:SetStyle("!_Frame") - MasterLooterFrame:SetFrameStrata('FULLSCREEN_DIALOG') - - hooksecurefunc("MasterLooterFrame_Show", _hook_MasterLootFrame_OnShow) - - BonusRollFrame:RemoveTextures() - SV.API:Set("Alert", BonusRollFrame) - BonusRollFrame.PromptFrame.Icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - BonusRollFrame.PromptFrame.Timer.Bar:SetTexture(SV.media.statusbar.default) - BonusRollFrame.PromptFrame.Timer.Bar:SetVertexColor(0.1, 1, 0.1) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(LootHistoryStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/lossofcontrol.lua b/SVUI_Skins/components/blizzard/lossofcontrol.lua deleted file mode 100644 index c0a609b..0000000 --- a/SVUI_Skins/components/blizzard/lossofcontrol.lua +++ /dev/null @@ -1,57 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -LOSSOFCONTROL MODR -########################################################## -]]-- -local _hook_LossOfControl = function(self, ...) - self.Icon:ClearAllPoints() - self.Icon:SetPoint("CENTER", self, "CENTER", 0, 0) - self.AbilityName:ClearAllPoints() - self.AbilityName:SetPoint("BOTTOM", self, 0, -28) - self.AbilityName.scrollTime = nil; - self.AbilityName:SetFont(SV.media.font.dialog, 20, 'OUTLINE') - self.TimeLeft.NumberText:ClearAllPoints() - self.TimeLeft.NumberText:SetPoint("BOTTOM", self, 4, -58) - self.TimeLeft.NumberText.scrollTime = nil; - self.TimeLeft.NumberText:SetFont(SV.media.font.number, 20, 'OUTLINE') - self.TimeLeft.SecondsText:ClearAllPoints() - self.TimeLeft.SecondsText:SetPoint("BOTTOM", self, 0, -80) - self.TimeLeft.SecondsText.scrollTime = nil; - self.TimeLeft.SecondsText:SetFont(SV.media.font.default, 20, 'OUTLINE') - if self.Anim:IsPlaying() then - self.Anim:Stop() - end -end - -local function LossOfControlStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.losscontrol ~= true then return end - local IconBackdrop = CreateFrame("Frame", nil, LossOfControlFrame) - IconBackdrop:WrapPoints(LossOfControlFrame.Icon) - IconBackdrop:SetFrameLevel(LossOfControlFrame:GetFrameLevel()-1) - IconBackdrop:SetStyle("Frame", "Icon") - LossOfControlFrame.Icon:SetTexCoord(.1, .9, .1, .9) - LossOfControlFrame:RemoveTextures() - LossOfControlFrame.AbilityName:ClearAllPoints() - --local bg = CreateFrame("Frame", nil, LossOfControlFrame) - hooksecurefunc("LossOfControlFrame_SetUpDisplay", _hook_LossOfControl) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(LossOfControlStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/mailbox.lua b/SVUI_Skins/components/blizzard/mailbox.lua deleted file mode 100644 index 052ad42..0000000 --- a/SVUI_Skins/components/blizzard/mailbox.lua +++ /dev/null @@ -1,139 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -HELPERS -########################################################## -]]-- -local function MailFrame_OnUpdate() - for b = 1, ATTACHMENTS_MAX_SEND do - local d = _G["SendMailAttachment"..b] - if not d.styled then - d:RemoveTextures()d:SetStyle("!_Frame", "Default") - d:SetStyle("Button") - d.styled = true - end - local e = d:GetNormalTexture() - if e then - e:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - e:InsetPoints() - end - end -end ---[[ -########################################################## -MAILBOX MODR -########################################################## -]]-- -local function MailBoxStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.mail ~= true then return end - - SV.API:Set("Window", MailFrame) - - for b = 1, INBOXITEMS_TO_DISPLAY do - local i = _G["MailItem"..b] - i:RemoveTextures() - i:SetStyle("Frame", "Inset") - i.Panel:ModPoint("TOPLEFT", 2, 1) - i.Panel:ModPoint("BOTTOMRIGHT", -2, 2) - local d = _G["MailItem"..b.."Button"] - d:RemoveTextures() - d:SetStyle("Button") - local e = _G["MailItem"..b.."ButtonIcon"] - e:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - e:InsetPoints() - end - SV.API:Set("CloseButton", MailFrameCloseButton) - SV.API:Set("PageButton", InboxPrevPageButton) - SV.API:Set("PageButton", InboxNextPageButton) - MailFrameTab1:RemoveTextures() - MailFrameTab2:RemoveTextures() - SV.API:Set("Tab", MailFrameTab1) - SV.API:Set("Tab", MailFrameTab2) - SendMailScrollFrame:RemoveTextures(true) - SendMailScrollFrame:SetStyle("!_Frame", "Inset") - SV.API:Set("ScrollFrame", SendMailScrollFrameScrollBar) - SendMailNameEditBox:SetStyle("Editbox") - SendMailSubjectEditBox:SetStyle("Editbox") - SendMailMoneyGold:SetStyle("Editbox") - SendMailMoneySilver:SetStyle("Editbox") - SendMailMoneyCopper:SetStyle("Editbox") - SendMailMoneyBg:Die() - SendMailMoneyInset:RemoveTextures() - - _G["SendMailMoneySilver"]:SetStyle("Editbox") - _G["SendMailMoneySilver"].Panel:ModPoint("TOPLEFT", -2, 1) - _G["SendMailMoneySilver"].Panel:ModPoint("BOTTOMRIGHT", -12, -1) - _G["SendMailMoneySilver"]:SetTextInsets(-1, -1, -2, -2) - - _G["SendMailMoneyCopper"]:SetStyle("Editbox") - _G["SendMailMoneyCopper"].Panel:ModPoint("TOPLEFT", -2, 1) - _G["SendMailMoneyCopper"].Panel:ModPoint("BOTTOMRIGHT", -12, -1) - _G["SendMailMoneyCopper"]:SetTextInsets(-1, -1, -2, -2) - - SendMailNameEditBox.Panel:ModPoint("BOTTOMRIGHT", 2, 4) - SendMailSubjectEditBox.Panel:ModPoint("BOTTOMRIGHT", 2, 0) - SendMailFrame:RemoveTextures() - - hooksecurefunc("SendMailFrame_Update", MailFrame_OnUpdate) - SendMailMailButton:SetStyle("Button") - SendMailCancelButton:SetStyle("Button") - OpenMailFrame:RemoveTextures(true) - OpenMailFrame:SetStyle("!_Frame", "Transparent", true) - OpenMailFrameInset:Die() - SV.API:Set("CloseButton", OpenMailFrameCloseButton) - OpenMailReportSpamButton:SetStyle("Button") - OpenMailReplyButton:SetStyle("Button") - OpenMailDeleteButton:SetStyle("Button") - OpenMailCancelButton:SetStyle("Button") - InboxFrame:RemoveTextures() - MailFrameInset:Die() - OpenMailScrollFrame:RemoveTextures(true) - OpenMailScrollFrame:SetStyle("!_Frame", "Default") - SV.API:Set("ScrollFrame", OpenMailScrollFrameScrollBar) - SendMailBodyEditBox:SetTextColor(1, 1, 1) - OpenMailBodyText:SetTextColor(1, 1, 1) - InvoiceTextFontNormal:SetTextColor(1, 1, 1) - OpenMailArithmeticLine:Die() - OpenMailLetterButton:RemoveTextures() - OpenMailLetterButton:SetStyle("!_Frame", "Default") - OpenMailLetterButton:SetStyle("Button") - OpenMailLetterButtonIconTexture:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - OpenMailLetterButtonIconTexture:InsetPoints() - OpenMailMoneyButton:RemoveTextures() - OpenMailMoneyButton:SetStyle("!_Frame", "Default") - OpenMailMoneyButton:SetStyle("Button") - OpenMailMoneyButtonIconTexture:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - OpenMailMoneyButtonIconTexture:InsetPoints() - for b = 1, ATTACHMENTS_MAX_SEND do - local d = _G["OpenMailAttachmentButton"..b] - d:RemoveTextures() - d:SetStyle("Button") - local e = _G["OpenMailAttachmentButton"..b.."IconTexture"] - if e then - e:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - e:InsetPoints() - end - end - OpenMailReplyButton:ModPoint("RIGHT", OpenMailDeleteButton, "LEFT", -2, 0) - OpenMailDeleteButton:ModPoint("RIGHT", OpenMailCancelButton, "LEFT", -2, 0) - SendMailMailButton:ModPoint("RIGHT", SendMailCancelButton, "LEFT", -2, 0) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(MailBoxStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/merchant.lua b/SVUI_Skins/components/blizzard/merchant.lua deleted file mode 100644 index 3e0389e..0000000 --- a/SVUI_Skins/components/blizzard/merchant.lua +++ /dev/null @@ -1,86 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -FRAME MODR -########################################################## -]]-- -local function MerchantStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.merchant ~= true then return end - MerchantFrame:RemoveTextures(true) - MerchantFrame:SetStyle("Frame", "Window", false, nil, 2, 4) - local level = MerchantFrame:GetFrameLevel() - if(level > 0) then - MerchantFrame:SetFrameLevel(level - 1) - else - MerchantFrame:SetFrameLevel(0) - end - MerchantBuyBackItem:RemoveTextures(true) - MerchantBuyBackItem:SetStyle("Frame", "Inset", true, 2, 2, 3) - MerchantBuyBackItem.Panel:SetFrameLevel(MerchantBuyBackItem.Panel:GetFrameLevel() + 1) - MerchantBuyBackItemItemButton:RemoveTextures() - MerchantBuyBackItemItemButton:SetStyle("Button") - MerchantExtraCurrencyInset:RemoveTextures() - MerchantExtraCurrencyBg:RemoveTextures() - MerchantFrameInset:RemoveTextures() - MerchantMoneyBg:RemoveTextures() - MerchantMoneyInset:RemoveTextures() - MerchantFrameInset:SetStyle("Frame", "Inset") - MerchantFrameInset.Panel:SetFrameLevel(MerchantFrameInset.Panel:GetFrameLevel() + 1) - SV.API:Set("DropDown", MerchantFrameLootFilter) - for b = 1, 2 do - SV.API:Set("Tab", _G["MerchantFrameTab"..b]) - end - for b = 1, 12 do - local d = _G["MerchantItem"..b.."ItemButton"] - local e = _G["MerchantItem"..b.."ItemButtonIconTexture"] - local o = _G["MerchantItem"..b]o:RemoveTextures(true) - o:SetStyle("!_Frame", "Inset") - d:RemoveTextures() - d:SetStyle("Button") - d:ModPoint("TOPLEFT", o, "TOPLEFT", 4, -4) - e:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - e:InsetPoints() - _G["MerchantItem"..b.."MoneyFrame"]:ClearAllPoints() - _G["MerchantItem"..b.."MoneyFrame"]:ModPoint("BOTTOMLEFT", d, "BOTTOMRIGHT", 3, 0) - end - MerchantBuyBackItemItemButton:RemoveTextures() - MerchantBuyBackItemItemButton:SetStyle("Button") - MerchantBuyBackItemItemButtonIconTexture:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - MerchantBuyBackItemItemButtonIconTexture:InsetPoints() - MerchantRepairItemButton:SetStyle("Button") - for b = 1, MerchantRepairItemButton:GetNumRegions()do - local p = select(b, MerchantRepairItemButton:GetRegions()) - if p:GetObjectType() == "Texture"then - p:SetTexCoord(0.04, 0.24, 0.06, 0.5) - p:InsetPoints() - end - end MerchantGuildBankRepairButton:SetStyle("Button") - MerchantGuildBankRepairButtonIcon:SetTexCoord(0.61, 0.82, 0.1, 0.52) - MerchantGuildBankRepairButtonIcon:InsetPoints() - MerchantRepairAllButton:SetStyle("Button") - MerchantRepairAllIcon:SetTexCoord(0.34, 0.1, 0.34, 0.535, 0.535, 0.1, 0.535, 0.535) - MerchantRepairAllIcon:InsetPoints() - MerchantFrame:ModWidth(360) - SV.API:Set("CloseButton", MerchantFrameCloseButton, MerchantFrame.Panel) - SV.API:Set("PageButton", MerchantNextPageButton) - SV.API:Set("PageButton", MerchantPrevPageButton) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(MerchantStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/misc.lua b/SVUI_Skins/components/blizzard/misc.lua index 98c4949..e3ae00c 100644 --- a/SVUI_Skins/components/blizzard/misc.lua +++ b/SVUI_Skins/components/blizzard/misc.lua @@ -455,9 +455,11 @@ local function MiscStyles() end if(SV.db.Skins.blizzard.merchant) then + MerchantFrame:RemoveTextures(true) MerchantFrame:SetStyle("Frame", "Window", false, nil, 2, 4) MerchantFrame:ModWidth(360) + local level = MerchantFrame:GetFrameLevel() if(level > 0) then MerchantFrame:SetFrameLevel(level - 1) diff --git a/SVUI_Skins/components/blizzard/petition.lua b/SVUI_Skins/components/blizzard/petition.lua deleted file mode 100644 index bfd8bc8..0000000 --- a/SVUI_Skins/components/blizzard/petition.lua +++ /dev/null @@ -1,59 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -PETITIONFRAME MODR -########################################################## -]]-- -local function PetitionFrameStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.petition ~= true then - return - end - - SV.API:Set("Window", PetitionFrame, nil, true) - PetitionFrameInset:Die() - - PetitionFrameSignButton:SetStyle("Button") - PetitionFrameRequestButton:SetStyle("Button") - PetitionFrameRenameButton:SetStyle("Button") - PetitionFrameCancelButton:SetStyle("Button") - - SV.API:Set("CloseButton", PetitionFrameCloseButton) - - PetitionFrameCharterTitle:SetTextColor(1, 1, 0) - PetitionFrameCharterName:SetTextColor(1, 1, 1) - PetitionFrameMasterTitle:SetTextColor(1, 1, 0) - PetitionFrameMasterName:SetTextColor(1, 1, 1) - PetitionFrameMemberTitle:SetTextColor(1, 1, 0) - - for i=1, 9 do - local frameName = ("PetitionFrameMemberName%d"):format(i) - local frame = _G[frameName]; - if(frame) then - frame:SetTextColor(1, 1, 1) - end - end - - PetitionFrameInstructions:SetTextColor(1, 1, 1) - - PetitionFrameRenameButton:ModPoint("LEFT", PetitionFrameRequestButton, "RIGHT", 3, 0) - PetitionFrameRenameButton:ModPoint("RIGHT", PetitionFrameCancelButton, "LEFT", -3, 0) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(PetitionFrameStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/petstable.lua b/SVUI_Skins/components/blizzard/petstable.lua deleted file mode 100644 index a16cbc3..0000000 --- a/SVUI_Skins/components/blizzard/petstable.lua +++ /dev/null @@ -1,46 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -PETSTABLE MODR -########################################################## -]]-- -local function PetStableStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.stable ~= true then return end - PetStableFrame:RemoveTextures() - PetStableFrameInset:RemoveTextures() - PetStableLeftInset:RemoveTextures() - PetStableBottomInset:RemoveTextures() - PetStableFrame:SetStyle("Frame", "Window") - PetStableFrameInset:SetStyle("!_Frame", 'Inset') - SV.API:Set("CloseButton", PetStableFrameCloseButton) - PetStablePrevPageButton:SetStyle("Button") - PetStableNextPageButton:SetStyle("Button") - SV.API:Set("PageButton", PetStablePrevPageButton) - SV.API:Set("PageButton", PetStableNextPageButton) - for j = 1, NUM_PET_ACTIVE_SLOTS do - SV.API:Set("ItemButton", _G['PetStableActivePet'..j], true) - end - for j = 1, NUM_PET_STABLE_SLOTS do - SV.API:Set("ItemButton", _G['PetStableStabledPet'..j], true) - end - PetStableSelectedPetIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(PetStableStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/tabard.lua b/SVUI_Skins/components/blizzard/tabard.lua deleted file mode 100644 index 832ed2f..0000000 --- a/SVUI_Skins/components/blizzard/tabard.lua +++ /dev/null @@ -1,91 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; -local ipairs = _G.ipairs; -local pairs = _G.pairs; -local type = _G.type; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -HELPERS -########################################################## -]]-- -local function cleanT(a,b) - for c=1,a:GetNumRegions()do - local d=select(c,a:GetRegions()) - if d and d:GetObjectType()=="Texture"then - local n=d:GetName(); - if n=='TabardFrameEmblemTopRight' or n=='TabardFrameEmblemTopLeft' or n=='TabardFrameEmblemBottomRight' or n=='TabardFrameEmblemBottomLeft' then return end - if b and type(b)=='boolean'then - d:Die() - elseif d:GetDrawLayer()==b then - d:SetTexture("") - elseif b and type(b)=='string'and d:GetTexture()~=b then - d:SetTexture("") - else - d:SetTexture("") - end - end - end -end ---[[ -########################################################## -TABARDFRAME MODR -########################################################## -]]-- -local function TabardFrameStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.tabard ~= true then - return - end - cleanT(TabardFrame, true) - TabardFrame:SetStyle("Frame", "Window2", false) - TabardModel:SetStyle("!_Frame", "Transparent") - TabardFrameCancelButton:SetStyle("Button") - TabardFrameAcceptButton:SetStyle("Button") - SV.API:Set("CloseButton", TabardFrameCloseButton) - TabardFrameCostFrame:RemoveTextures() - TabardFrameCustomizationFrame:RemoveTextures() - TabardFrameInset:Die() - TabardFrameMoneyInset:Die() - TabardFrameMoneyBg:RemoveTextures() - for b = 1, 5 do - local c = "TabardFrameCustomization"..b;_G[c]:RemoveTextures() - SV.API:Set("PageButton", _G[c.."LeftButton"]) - SV.API:Set("PageButton", _G[c.."RightButton"]) - if b > 1 then - _G[c]:ClearAllPoints() - _G[c]:ModPoint("TOP", _G["TabardFrameCustomization"..b-1], "BOTTOM", 0, -6) - else - local d, e, f, g, h = _G[c]:GetPoint() - _G[c]:ModPoint(d, e, f, g, h + 4) - end - end - TabardCharacterModelRotateLeftButton:SetPoint("BOTTOMLEFT", 4, 4) - TabardCharacterModelRotateRightButton:SetPoint("TOPLEFT", TabardCharacterModelRotateLeftButton, "TOPRIGHT", 4, 0) - hooksecurefunc(TabardCharacterModelRotateLeftButton, "SetPoint", function(self, d, j, k, l, m) - if d ~= "BOTTOMLEFT" or l ~= 4 or m ~= 4 then - self:SetPoint("BOTTOMLEFT", 4, 4) - end - end) - hooksecurefunc(TabardCharacterModelRotateRightButton, "SetPoint", function(self, d, j, k, l, m) - if d ~= "TOPLEFT" or l ~= 4 or m ~= 0 then - self:SetPoint("TOPLEFT", _G.TabardCharacterModelRotateLeftButton, "TOPRIGHT", 4, 0) - end - end) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(TabardFrameStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/talents.lua b/SVUI_Skins/components/blizzard/talents.lua index 327a7b9..03e08c5 100644 --- a/SVUI_Skins/components/blizzard/talents.lua +++ b/SVUI_Skins/components/blizzard/talents.lua @@ -57,7 +57,10 @@ local function ChangeTabHelper(this) end local function StyleGlyphHolder(holder, offset) - if holder.styled then return end + if((not holder) or holder.styled) then return end + offset = offset or 1; + + holder:RemoveTextures() local outer = holder:CreateTexture(nil, "OVERLAY") outer:WrapPoints(holder, offset, offset) @@ -81,8 +84,9 @@ local function StyleGlyphHolder(holder, offset) local cd = holder:GetName() and _G[holder:GetName().."Cooldown"] if cd then cd:ClearAllPoints() - cd:InsetPoints() - end + cd:InsetPoints(holder) + end + holder.styled = true end --[[ @@ -337,44 +341,51 @@ MOD LOADING MOD:SaveBlizzardStyle("Blizzard_TalentUI", TalentFrameStyle) local function GlyphStyle() + assert(GlyphFrame, "GlyphFrame Not Loaded") + GlyphFrame:RemoveTextures() - --GlyphFrame.background:ClearAllPoints() - --GlyphFrame.background:SetAllPoints(PlayerTalentFrameInset) GlyphFrame:SetStyle("!_Frame", "Premium") - GlyphFrameSideInset:RemoveTextures() - GlyphFrameClearInfoFrame:RemoveTextures() - GlyphFrameClearInfoFrame.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9 ) - GlyphFrameClearInfoFrame:ModWidth(GlyphFrameClearInfoFrame:GetWidth()-2) - GlyphFrameClearInfoFrame:ModHeight(GlyphFrameClearInfoFrame:GetHeight()-2) - GlyphFrameClearInfoFrame.icon:ModSize(GlyphFrameClearInfoFrame:GetSize()) - GlyphFrameClearInfoFrame:ModPoint("TOPLEFT", GlyphFrame, "BOTTOMLEFT", 6, -10) + + if(GlyphFrameSideInset) then GlyphFrameSideInset:RemoveTextures() end + if(GlyphFrameHeader1) then GlyphFrameHeader1:RemoveTextures() end + if(GlyphFrameHeader2) then GlyphFrameHeader2:RemoveTextures() end + if(GlyphFrameScrollFrame) then GlyphFrameScrollFrame:SetStyle("Frame", "Inset", false, 3, 2, 2) end + if(GlyphFrameSearchBox) then GlyphFrameSearchBox:SetStyle("Editbox") end + + if(GlyphFrameClearInfoFrame and GlyphFrameClearInfoFrame.icon) then + GlyphFrameClearInfoFrame:RemoveTextures() + + local w,h = GlyphFrameClearInfoFrame:GetSize() + GlyphFrameClearInfoFrame:SetSize((w - 2),(h - 2)) + GlyphFrameClearInfoFrame:SetPoint("TOPLEFT", GlyphFrame, "BOTTOMLEFT", 6, -10) + GlyphFrameClearInfoFrame.icon:SetSize((w - 2),(h - 2)) + GlyphFrameClearInfoFrame.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + end + SV.API:Set("DropDown", GlyphFrameFilterDropDown, 212) - GlyphFrameSearchBox:SetStyle("Editbox") SV.API:Set("ScrollFrame", GlyphFrameScrollFrameScrollBar, 5) - for b = 1, 10 do - local e = _G["GlyphFrameScrollFrameButton"..b] - local icon = _G["GlyphFrameScrollFrameButton"..b.."Icon"] - e:RemoveTextures() - SV.API:Set("ItemButton", e) - icon:SetTexCoord(0.1, 0.9, 0.1, 0.9 ) + for i = 1, 10 do + local button = _G["GlyphFrameScrollFrameButton"..i] + if(button) then + SV.API:Set("ItemButton", button) + local icon = _G["GlyphFrameScrollFrameButton"..i.."Icon"] + if(icon) then + icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + end + end end - for b = 1, 6 do - local glyphHolder = _G["GlyphFrameGlyph"..b] + for i = 1, 6 do + local glyphHolder = _G["GlyphFrameGlyph"..i] if glyphHolder then - glyphHolder:RemoveTextures() - if(b % 2 == 0) then + if(i % 2 == 0) then StyleGlyphHolder(glyphHolder, 4) else StyleGlyphHolder(glyphHolder, 1) end end end - - GlyphFrameHeader1:RemoveTextures() - GlyphFrameHeader2:RemoveTextures() - GlyphFrameScrollFrame:SetStyle("Frame", "Inset", false, 3, 2, 2) end MOD:SaveBlizzardStyle("Blizzard_GlyphUI", GlyphStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/taxi.lua b/SVUI_Skins/components/blizzard/taxi.lua deleted file mode 100644 index b20d4ba..0000000 --- a/SVUI_Skins/components/blizzard/taxi.lua +++ /dev/null @@ -1,37 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -TAXIFRAME MODR -########################################################## -]]-- -local function TaxiStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.taxi ~= true then - return - end - - SV.API:Set("Window", TaxiFrame) - - --TaxiRouteMap:SetStyle("Frame", "Blackout") - --TaxiRouteMap.Panel:WrapPoints(TaxiRouteMap, 4, 4) - - SV.API:Set("CloseButton", TaxiFrame.CloseButton) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(TaxiStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/trade.lua b/SVUI_Skins/components/blizzard/trade.lua deleted file mode 100644 index 454356c..0000000 --- a/SVUI_Skins/components/blizzard/trade.lua +++ /dev/null @@ -1,110 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; -local ipairs = _G.ipairs; -local pairs = _G.pairs; -local type = _G.type; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -TRADEFRAME MODR -########################################################## -]]-- -local function TradeFrameStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.trade ~= true then - return - end - - SV.API:Set("Window", TradeFrame, true) - - TradeFrameInset:Die() - TradeFrameTradeButton:SetStyle("Button") - TradeFrameCancelButton:SetStyle("Button") - SV.API:Set("CloseButton", TradeFrameCloseButton, TradeFrame.Panel) - TradePlayerInputMoneyFrameGold:SetStyle("Editbox") - TradePlayerInputMoneyFrameSilver:SetStyle("Editbox") - TradePlayerInputMoneyFrameCopper:SetStyle("Editbox") - TradeRecipientItemsInset:Die() - TradePlayerItemsInset:Die() - TradePlayerInputMoneyInset:Die() - TradePlayerEnchantInset:Die() - TradeRecipientEnchantInset:Die() - TradeRecipientMoneyInset:Die() - TradeRecipientMoneyBg:Die() - local inputs = { - "TradePlayerInputMoneyFrameSilver", - "TradePlayerInputMoneyFrameCopper" - } - for _,frame in pairs(inputs)do - _G[frame]:SetStyle("Editbox") - _G[frame].Panel:ModPoint("TOPLEFT", -2, 1) - _G[frame].Panel:ModPoint("BOTTOMRIGHT", -12, -1) - _G[frame]:SetTextInsets(-1, -1, -2, -2) - end - for i = 1, 7 do - local W = _G["TradePlayerItem"..i] - local X = _G["TradeRecipientItem"..i] - local Y = _G["TradePlayerItem"..i.."ItemButton"] - local Z = _G["TradeRecipientItem"..i.."ItemButton"] - local b = _G["TradePlayerItem"..i.."ItemButtonIconTexture"] - local z = _G["TradeRecipientItem"..i.."ItemButtonIconTexture"] - if Y and Z then - W:RemoveTextures() - X:RemoveTextures() - Y:RemoveTextures() - Z:RemoveTextures() - b:InsetPoints(Y) - b:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - Y:SetStyle("!_Frame", "Button", true) - Y:SetStyle("Button") - Y.bg = CreateFrame("Frame", nil, Y) - Y.bg:SetStyle("Frame", "Inset") - Y.bg:SetPoint("TOPLEFT", Y, "TOPRIGHT", 4, 0) - Y.bg:SetPoint("BOTTOMRIGHT", _G["TradePlayerItem"..i.."NameFrame"], "BOTTOMRIGHT", 0, 14) - Y.bg:SetFrameLevel(Y:GetFrameLevel()-3) - Y:SetFrameLevel(Y:GetFrameLevel()-1) - z:InsetPoints(Z) - z:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - Z:SetStyle("!_Frame", "Button", true) - Z:SetStyle("Button") - Z.bg = CreateFrame("Frame", nil, Z) - Z.bg:SetStyle("Frame", "Inset") - Z.bg:SetPoint("TOPLEFT", Z, "TOPRIGHT", 4, 0) - Z.bg:SetPoint("BOTTOMRIGHT", _G["TradeRecipientItem"..i.."NameFrame"], "BOTTOMRIGHT", 0, 14) - Z.bg:SetFrameLevel(Z:GetFrameLevel()-3) - Z:SetFrameLevel(Z:GetFrameLevel()-1) - end - end - TradeHighlightPlayerTop:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayerBottom:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayerMiddle:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayer:SetFrameStrata("HIGH") - TradeHighlightPlayerEnchantTop:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayerEnchantBottom:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayerEnchantMiddle:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayerEnchant:SetFrameStrata("HIGH") - TradeHighlightRecipientTop:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipientBottom:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipientMiddle:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipient:SetFrameStrata("HIGH") - TradeHighlightRecipientEnchantTop:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipientEnchantBottom:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipientEnchantMiddle:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipientEnchant:SetFrameStrata("HIGH") -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(TradeFrameStyle) \ No newline at end of file diff --git a/SVUI_UnitFrames/elements/essentials.lua b/SVUI_UnitFrames/elements/essentials.lua index d32f79b..f2a4958 100644 --- a/SVUI_UnitFrames/elements/essentials.lua +++ b/SVUI_UnitFrames/elements/essentials.lua @@ -385,7 +385,7 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText) else frame.TextGrip = CreateFrame("Frame", nil, frame) frame.TextGrip:SetFrameStrata("LOW") - frame.TextGrip:SetFrameLevel(99) + frame.TextGrip:SetFrameLevel(frame:GetFrameLevel() + 1) frame.TextGrip:ModPoint("TOPLEFT", frame.ActionPanel, "TOPLEFT", 2, -2) frame.TextGrip:ModPoint("BOTTOMRIGHT", frame.ActionPanel, "BOTTOMRIGHT", -2, 2) end