diff --git a/Interface/AddOns/SVUI/framework/api/api.xml b/Interface/AddOns/SVUI/framework/api/api.xml index 058f1d8..84610e1 100644 --- a/Interface/AddOns/SVUI/framework/api/api.xml +++ b/Interface/AddOns/SVUI/framework/api/api.xml @@ -554,63 +554,19 @@ <Frame name="SVUI_PanelTemplate_Inset" virtual="true"> <Attributes> <Attribute name="panelID" type="string" value="inset" /> - <Attribute name="panelPadding" type="number" value="2" /> - <Attribute name="panelColor" type="string" value="transparent" /> + <Attribute name="panelPadding" type="number" value="1" /> + <Attribute name="panelColor" type="string" value="hinted" /> <Attribute name="panelGradient" type="boolean" value="false" /> <Attribute name="panelTexUpdate" type="boolean" value="false" /> - <Attribute name="panelSkipUpdate" type="boolean" value="true" /> + <Attribute name="panelSkipUpdate" type="boolean" value="false" /> </Attributes> - <Backdrop bgFile="Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT" edgeFile="Interface\BUTTONS\WHITE8X8" tile="false"> - <EdgeSize val="2" /> - <TileSize val="0" /> + <Backdrop bgFile="Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT" tile="true" edgeFile="Interface\BUTTONS\WHITE8X8"> + <EdgeSize val="1" /> + <TileSize val="20" /> <BackgroundInsets left="0" right="0" top="0" bottom="0" /> - <Color r="0" g="0" b="0" a="0.5" /> <BorderColor r="0" g="0" b="0" a="1" /> + <Color r="0" g="0" b="0" a="0.35" /> </Backdrop> - <Layers> - <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="2" /> - </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="2" /> - </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="2" /> - </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="2" /> - </Size> - <Color r="0" g="0" b="0" a="1" /> - </Texture> - </Layer> - </Layers> </Frame> <Frame name="SVUI_PanelTemplate_Comic" virtual="true"> diff --git a/Interface/AddOns/SVUI/framework/api/api_templates.lua b/Interface/AddOns/SVUI/framework/api/api_templates.lua index 873efeb..c685c89 100644 --- a/Interface/AddOns/SVUI/framework/api/api_templates.lua +++ b/Interface/AddOns/SVUI/framework/api/api_templates.lua @@ -722,24 +722,30 @@ local function SetSlotTemplate(self, underlay, padding, x, y, shadowAlpha) end end -local function SetCheckboxTemplate(self, underlay, x, y) +local function SetCheckboxTemplate(self, shrink, x, y) if(not self or (self and self.Panel)) then return end - if(underlay) then + local width, height = self:GetSize() + if(shrink) then x = x or -7 y = y or -7 end - CreatePanelTemplate(self, "Slot", underlay, true, 1, x, y) - CreateButtonPanel(self, false, true) + width = width + (x or 0) + height = height + (y or 0) - hooksecurefunc(self, "SetChecked", function(self, checked) - local r,g,b = 0,0,0 - if(checked == true) then - r,g,b = self:GetCheckedTexture():GetVertexColor() - end - self:SetBackdropBorderColor(r,g,b) - end) + self:SetSize(width, height) + + CreatePanelTemplate(self, "Inset", true, true, 1, x, y) + --CreateButtonPanel(self, false, true) + + -- hooksecurefunc(self, "SetChecked", function(self, checked) + -- local r,g,b = 0,0,0 + -- if(checked == true) then + -- r,g,b = self:GetCheckedTexture():GetVertexColor() + -- end + -- self:SetBackdropBorderColor(r,g,b) + -- end) end local function SetEditboxTemplate(self, x, y, fixed) diff --git a/Interface/AddOns/SVUI/framework/docks/docks.lua b/Interface/AddOns/SVUI/framework/docks/docks.lua index fcf6a8c..e2c05cb 100644 --- a/Interface/AddOns/SVUI/framework/docks/docks.lua +++ b/Interface/AddOns/SVUI/framework/docks/docks.lua @@ -113,12 +113,16 @@ _G.HideSuperDocks = function(self, button) if SV.cache.Docks.IsFaded then SV.cache.Docks.IsFaded = nil; SV:SecureFadeIn(Dock.BottomLeft, 0.2, Dock.BottomLeft:GetAlpha(), 1) + SV:SecureFadeIn(Dock.BottomLeft.Bar, 0.2, Dock.BottomLeft.Bar:GetAlpha(), 1) SV:SecureFadeIn(Dock.BottomRight, 0.2, Dock.BottomRight:GetAlpha(), 1) + SV:SecureFadeIn(Dock.BottomRight.Bar, 0.2, Dock.BottomRight.Bar:GetAlpha(), 1) SVLib:Trigger("DOCKS_FADE_IN"); else SV.cache.Docks.IsFaded = true; SV:SecureFadeOut(Dock.BottomLeft, 0.2, Dock.BottomLeft:GetAlpha(), 0, true) + SV:SecureFadeOut(Dock.BottomLeft.Bar, 0.2, Dock.BottomLeft.Bar:GetAlpha(), 0, true) SV:SecureFadeOut(Dock.BottomRight, 0.2, Dock.BottomRight:GetAlpha(), 0, true) + SV:SecureFadeOut(Dock.BottomRight.Bar, 0.2, Dock.BottomRight.Bar:GetAlpha(), 0, true) SVLib:Trigger("DOCKS_FADE_OUT"); end end @@ -128,8 +132,10 @@ function Dock:EnterFade() if SV.cache.Docks.IsFaded then self.BottomLeft:Show() SV:SecureFadeIn(self.BottomLeft, 0.2, self.BottomLeft:GetAlpha(), 1) + SV:SecureFadeIn(self.BottomLeft.Bar, 0.2, self.BottomLeft.Bar:GetAlpha(), 1) self.BottomRight:Show() SV:SecureFadeIn(self.BottomRight, 0.2, self.BottomRight:GetAlpha(), 1) + SV:SecureFadeIn(self.BottomRight.Bar, 0.2, self.BottomRight.Bar:GetAlpha(), 1) SVLib:Trigger("DOCKS_FADE_IN"); end end @@ -137,7 +143,9 @@ end function Dock:ExitFade() if SV.cache.Docks.IsFaded then SV:SecureFadeOut(self.BottomLeft, 0.2, self.BottomLeft:GetAlpha(), 0, true) + SV:SecureFadeOut(self.BottomLeft.Bar, 0.2, self.BottomLeft.Bar:GetAlpha(), 0, true) SV:SecureFadeOut(self.BottomRight, 0.2, self.BottomRight:GetAlpha(), 0, true) + SV:SecureFadeOut(self.BottomRight.Bar, 0.2, self.BottomRight.Bar:GetAlpha(), 0, true) SVLib:Trigger("DOCKS_FADE_OUT"); end end diff --git a/Interface/AddOns/SVUI/framework/movers/mover_mentalo.lua b/Interface/AddOns/SVUI/framework/movers/mover_mentalo.lua index 29cd08d..b4f8069 100644 --- a/Interface/AddOns/SVUI/framework/movers/mover_mentalo.lua +++ b/Interface/AddOns/SVUI/framework/movers/mover_mentalo.lua @@ -69,6 +69,24 @@ local DraggableFrames = { "VideoOptionsFrame", "VoidStorageFrame", --"WorldStateAlwaysUpFrame" }; + +local CenteredFrames = { + ["BattlefieldMinimap"] = {"TOP", "TOP", 0, -80}, + ["CalendarFrame"] = {"TOP", "TOP", 0, -80}, + ["GameMenuFrame"] = {"TOP", "TOP", 0, -80}, + ["GMSurveyFrame"] = {"TOP", "TOP", 0, -80}, + ["GarrisonLandingPage"] = {"TOP", "TOP", 0, -80}, + ["GarrisonMissionFrame"] = {"TOP", "TOP", 0, -80}, + ["HelpFrame"] = {"TOP", "TOP", 0, -80}, + ["InterfaceOptionsFrame"] = {"TOP", "TOP", 0, -80}, + ["KeyBindingFrame"] = {"TOP", "TOP", 0, -80}, + ["LFGDungeonReadyPopup"] = {"TOP", "TOP", 0, -80}, + ["MacOptionsFrame"] = {"TOP", "TOP", 0, -80}, + ["ReadyCheckFrame"] = {"TOP", "TOP", 0, -80}, + ["RolePollPopup"] = {"TOP", "TOP", 0, -80}, + ["TutorialFrame"] = {"TOP", "TOP", 0, -80}, + ["VideoOptionsFrame"] = {"TOP", "TOP", 0, -80}, +}; --[[ /$$$$$$ /$$ /$$ /$$ /$$__ $$ | $$ |__/ | $$ @@ -266,10 +284,15 @@ end local function CurrentPosition(frame) if not frame then return end local anchor1, parent, anchor2, x, y = frame:GetPoint() - anchor1 = anchor1 or "TOPLEFT" - anchor2 = anchor2 or "TOPLEFT" - x = x or 50 - y = y or -50 + if((not anchor1) or (not anchor2) or (not x) or (not y)) then + local frameName = frame:GetName() + if(CenteredFrames[frameName]) then + anchor1, anchor2, x, y = unpack(CenteredFrames[frameName]) + else + anchor1, anchor2, x, y = "TOPLEFT", "TOPLEFT", 160, -80 + end + end + local parentName if not parent then parentName = "SVUIParent" diff --git a/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/castbar.lua b/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/castbar.lua index e4cc177..d0e229c 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/castbar.lua +++ b/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/castbar.lua @@ -236,7 +236,9 @@ local UNIT_SPELLCAST_STOP = function(self, event, unit, spellname, _, castid) castbar:SetValue(0) end - castbar:Hide() + if((not castbar.recipecount) or (castbar.recipecount and castbar.recipecount < 2)) then + castbar:Hide() + end if(castbar.PostCastStop) then return castbar:PostCastStop(unit, spellname, castid) diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua index 22d0ecc..4c8ba3c 100644 --- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua +++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua @@ -285,7 +285,6 @@ end local SlotUpdate = function(self, slotID) if(not self[slotID]) then return end - --print(self[slotID]:GetName()) local bag = self:GetID(); local slot = self[slotID]; local bagType = self.bagFamily; @@ -309,18 +308,14 @@ local SlotUpdate = function(self, slotID) slot.questIcon:Hide(); end - CooldownFrame_SetTimer(slot.cooldown, start, duration, enable); - - if(duration > 0 and enable == 0) then - SetItemButtonTextureVertexColor(slot, 0.4, 0.4, 0.4) - else - SetItemButtonTextureVertexColor(slot, 1, 1, 1) - end - slot:SetBackdropColor(0, 0, 0, 0.6) slot:SetBackdropBorderColor(0, 0, 0, 1) - if(itemLink) then + 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) + elseif(itemLink) then local rarity = select(3, GetItemInfo(itemLink)) local isQuestItem, questId, isActiveQuest = GetContainerItemQuestInfo(bag, slotID); @@ -334,25 +329,21 @@ local SlotUpdate = function(self, slotID) elseif(rarity) then if(rarity > 1) then local r, g, b = GetItemQualityColor(rarity) - slot:SetBackdropColor(r, g, b, 0.6) slot:SetBackdropBorderColor(r, g, b, 1) elseif(rarity == 0) then if(slot.JunkIcon) then slot.JunkIcon:Show() end - slot:SetBackdropColor(0, 0, 0, 0.6) - slot:SetBackdropBorderColor(0, 0, 0, 1) end - else - slot:SetBackdropColor(0, 0, 0, 0.6) - slot:SetBackdropBorderColor(0, 0, 0, 1) end 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) + + CooldownFrame_SetTimer(slot.cooldown, start, duration, enable); + + if(duration > 0 and enable == 0) then + SetItemButtonTextureVertexColor(slot, 0.4, 0.4, 0.4) + else + SetItemButtonTextureVertexColor(slot, 1, 1, 1) end if(C_NewItems.IsNewItem(bag, slotID)) then diff --git a/Interface/AddOns/SVUI/packages/unit/elements/castbar.lua b/Interface/AddOns/SVUI/packages/unit/elements/castbar.lua index da2c355..d581d0d 100644 --- a/Interface/AddOns/SVUI/packages/unit/elements/castbar.lua +++ b/Interface/AddOns/SVUI/packages/unit/elements/castbar.lua @@ -208,8 +208,8 @@ local Fader_OnEvent = function(self, event, arg) end end -local function SetCastbarFading(frame, castbar, texture) - local fader = CreateFrame("Frame", nil, frame) +local function SetCastbarFading(castbar, texture) + local fader = CreateFrame("Frame", nil, castbar) fader:SetFrameLevel(2) fader:FillInner(castbar) fader:SetBackdrop({bgFile = texture}) @@ -223,7 +223,7 @@ local function SetCastbarFading(frame, castbar, texture) fader:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP") fader:RegisterEvent("UNIT_SPELLCAST_FAILED") fader:RegisterEvent("UNIT_SPELLCAST_FAILED_QUIET") - fader.mask = CreateFrame("Frame", nil, frame) + fader.mask = CreateFrame("Frame", nil, castbar) fader.mask:SetBackdrop({bgFile = texture}) fader.mask:FillInner(castbar) fader.mask:SetFrameLevel(2) @@ -722,7 +722,7 @@ function MOD:CreateCastbar(frame, reversed, moverName, ryu, useFader, isBoss) end if useFader then - SetCastbarFading(frame, castbar, SV.Media.bar.lazer) + SetCastbarFading(castbar, SV.Media.bar.lazer) end castbar.TimeFormat = "REMAINING" diff --git a/Interface/AddOns/SVUI/scripts/misc.lua b/Interface/AddOns/SVUI/scripts/misc.lua index 68c5e60..eb3ecb4 100644 --- a/Interface/AddOns/SVUI/scripts/misc.lua +++ b/Interface/AddOns/SVUI/scripts/misc.lua @@ -268,9 +268,9 @@ local function LoadDressupHelper() --[[ CLOAK AND HELMET TOGGLES ]]-- helmet = CreateFrame('CheckButton', nil, CharacterModelFrame, "OptionsCheckButtonTemplate") - helmet:SetSize(24, 24) - helmet:RemoveTextures() - helmet:SetCheckboxTemplate(true) + helmet:SetSize(16, 16) + --helmet:RemoveTextures() + --helmet:SetCheckboxTemplate() helmet.text = helmet:CreateFontString(nil, 'OVERLAY', "GameFontNormal") helmet.text:SetPoint("LEFT", 24, 0) helmet.TText = "Show/Hide Helmet" @@ -279,9 +279,9 @@ local function LoadDressupHelper() helmet:SetScript('OnUpdate', DressUpdateHandler) cloak = CreateFrame('CheckButton', nil, CharacterModelFrame, "OptionsCheckButtonTemplate") - cloak:SetSize(24, 24) - cloak:RemoveTextures() - cloak:SetCheckboxTemplate(true) + cloak:SetSize(16, 16) + --cloak:RemoveTextures() + --cloak:SetCheckboxTemplate() cloak.text = cloak:CreateFontString(nil, 'OVERLAY', "GameFontNormal") cloak.text:SetPoint("LEFT", 24, 0) cloak.TText = "Show/Hide Cloak" diff --git a/Interface/AddOns/SVUI/system/media.lua b/Interface/AddOns/SVUI/system/media.lua index bfb0e15..a2471c1 100644 --- a/Interface/AddOns/SVUI/system/media.lua +++ b/Interface/AddOns/SVUI/system/media.lua @@ -161,7 +161,7 @@ do ["red"] = {0.9, 0.08, 0.08, 1}, ["yellow"] = {1, 1, 0, 1}, ["transparent"] = {0, 0, 0, 0.5}, - ["hinted"] = {0, 0, 0, 0.2}, + ["hinted"] = {0, 0, 0, 0.35}, ["white"] = {1, 1, 1, 1}, } diff --git a/Interface/AddOns/SVUI/system/screen.lua b/Interface/AddOns/SVUI/system/screen.lua index 8828c60..04b5a45 100644 --- a/Interface/AddOns/SVUI/system/screen.lua +++ b/Interface/AddOns/SVUI/system/screen.lua @@ -161,9 +161,9 @@ function SV.Screen:Update() local gxScale; if(SV.db.general.autoScale) then - gxScale = max(0.64, min(1.15, gxMod)); + gxScale = max(0.7, min(1.15, gxMod)); else - gxScale = max(0.64, min(1.15, GetCVar("uiScale") or UIParent:GetScale() or gxMod)); + gxScale = max(0.7, min(1.15, GetCVar("uiScale") or UIParent:GetScale() or gxMod)); end SCREEN_MOD = (gxMod / gxScale); diff --git a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua index ad83198..b11a3bc 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua +++ b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua @@ -144,7 +144,7 @@ SV.Options.args.primary = { guiInline = true, args = { Install = { - order = 3, + order = 1, width = "full", type = "execute", name = L["Install"], @@ -152,7 +152,7 @@ SV.Options.args.primary = { func = function() SV.Setup:Install() SV:ToggleConfig() end }, ToggleAnchors = { - order = 4, + order = 2, width = "full", type = "execute", name = L["Move Frames"], @@ -160,7 +160,7 @@ SV.Options.args.primary = { func = function() SV.Mentalo:Toggle() end }, ResetAllMovers = { - order = 5, + order = 3, width = "full", type = "execute", name = L["Reset Anchors"], @@ -168,7 +168,7 @@ SV.Options.args.primary = { func = function() SV.Mentalo:Reset() end }, toggleKeybind = { - order = 6, + order = 4, width = "full", type = "execute", name = L["Keybind Mode"], @@ -180,14 +180,6 @@ SV.Options.args.primary = { disabled = function() return not SV.db.SVBar.enable end } }, - }, - quickGroup2 = { - order = 4, - name = "", - type = "group", - width = "full", - guiInline = true, - args = {}, }, } }; diff --git a/Interface/AddOns/SVUI_CraftOMatic/components/cooking.lua b/Interface/AddOns/SVUI_CraftOMatic/components/cooking.lua index 3f25b1f..ca26aae 100644 --- a/Interface/AddOns/SVUI_CraftOMatic/components/cooking.lua +++ b/Interface/AddOns/SVUI_CraftOMatic/components/cooking.lua @@ -42,7 +42,7 @@ local Schema = PLUGIN.Schema; LOCAL VARS ########################################################## ]]-- -local cookingSpell, campFire, skillRank, skillModifier, DockButton; +local cookingSpell, campFire, skillRank, skillModifier, DockButton, usePierre; --[[ ########################################################## LOCAL FUNCTIONS @@ -85,7 +85,28 @@ end local function SendModeMessage(...) if not CombatText_AddMessage then return end CombatText_AddMessage(...) -end +end + +local function FindPierre() + local summonedPetGUID = C_PetJournal.GetSummonedPetGUID() + if usePierre then + if((not summonedPetGUID) or (summonedPetGUID and (summonedPetGUID ~= usePierre))) then + C_PetJournal.SummonPetByGUID(usePierre) + end + else + local numPets, numOwned = C_PetJournal.GetNumPets() + for index = 1, numOwned, 1 do + local petID, _, _, _, _, _, _, _, _, _, companionID = C_PetJournal.GetPetInfoByIndex(index) + if(companionID == 70082) then + usePierre = petID + if((not summonedPetGUID) or (summonedPetGUID and (summonedPetGUID ~= usePierre))) then + C_PetJournal.SummonPetByGUID(usePierre) + end + break + end + end + end +end --[[ ########################################################## CORE NAMESPACE @@ -178,11 +199,14 @@ function PLUGIN.Cooking:Enable() PlaySoundFile("Sound\\Spells\\Tradeskills\\CookingPrepareA.wav") PLUGIN.ModeAlert:SetBackdropColor(0.25, 0.52, 0.1) + FindPierre() + if(not IsSpellKnown(818)) then PLUGIN:ModeLootLoader("Cooking", "WTF is Cooking?", "You have no clue how to cook! \nEven toast is a mystery to you. \nGo find a trainer and learn \nhow to do this simple job."); else local msg = GetTitleAndSkill(); - if cookingSpell and GetSpellCooldown(campFire) > 0 then + --70082 + if(usePierre or (cookingSpell and (GetSpellCooldown(campFire) > 0))) then PLUGIN:ModeLootLoader("Cooking", msg, "Double-Right-Click anywhere on the screen \nto open your cookbook."); _G["SVUI_ModeCaptureWindow"]:SetAttribute("type", "spell") _G["SVUI_ModeCaptureWindow"]:SetAttribute('spell', cookingSpell) @@ -227,5 +251,6 @@ LOADER ########################################################## ]]-- function PLUGIN:LoadCookingMode() + usePierre = FindPierre() self.Cooking:Update() end \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/achievement.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/achievement.lua index 273f8b8..5618868 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/achievement.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/achievement.lua @@ -151,6 +151,8 @@ local function AchievementStyle() return end + AchievementFrameHeader:EnableMouse(false) + for _, gName in pairs(AchievementFrameList) do local frame = _G[gName] if(frame) then diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua index 59d789e..4dd734e 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua @@ -209,10 +209,6 @@ local function LFDFrameStyle() for _,name in pairs(LFDFrameList) do local frame = _G[name]; if frame then - local check = frame.checkButton or frame.CheckButton - check:RemoveTextures() - check:SetCheckboxTemplate(true, -5, -5) - check:SetFrameLevel(check:GetFrameLevel() + 50) frame:DisableDrawLayer("BACKGROUND") frame:DisableDrawLayer("OVERLAY") end @@ -289,16 +285,6 @@ local function LFDFrameStyle() LFDQueueFrameSpecificListScrollFrame:RemoveTextures() LFDQueueFrameFindGroupButton:SetButtonTemplate() hooksecurefunc("LFDQueueFrameRandom_UpdateFrame", LFDQueueRandom_OnUpdate) - - hooksecurefunc("ScenarioQueueFrameSpecific_Update", function() - for i = 1, NUM_SCENARIO_CHOICE_BUTTONS do - local box = _G["ScenarioQueueFrameSpecificButton"..i.."EnableButton"] - if(box and (not box.Panel)) then - box:RemoveTextures() - box:SetCheckboxTemplate(true, -2, -3) - end - end - end) PLUGIN:ApplyDropdownStyle(LFDQueueFrameTypeDropDown) @@ -392,11 +378,6 @@ local function LFDFrameStyle() o:SetTexture(0,0,0,0) end end) - hooksecurefunc(C:GetCheckedTexture(), "SetTexture", function(o, D) - if D ~= nil then - o:SetTexture(0,0,0,0) - end - end) end for u = 1, 7 do local C = _G['LFRBrowseFrameColumnHeader'..u] @@ -428,23 +409,23 @@ local function LFDFrameStyle() ScenarioQueueFrameRandomScrollFrame:SetBasicPanel() RaidFinderQueueFrameScrollFrame:SetBasicPanel() - for u = 1, NUM_LFD_CHOICE_BUTTONS do - local box = _G["LFDQueueFrameSpecificListButton"..u.."EnableButton"] - if(box and (not box.Panel)) then - box:RemoveTextures() - box:SetCheckboxTemplate(true, -2, -3) - box:SetFrameLevel(box:GetFrameLevel() + 50) - end - end - - for u = 1, NUM_LFR_CHOICE_BUTTONS do - local box = _G["LFRQueueFrameSpecificListButton"..u.."EnableButton"] - if(box and (not box.Panel)) then - box:RemoveTextures() - box:SetCheckboxTemplate(true, -2, -3) - box:SetFrameLevel(box:GetFrameLevel() + 50) - end - end + -- for u = 1, NUM_LFD_CHOICE_BUTTONS do + -- local box = _G["LFDQueueFrameSpecificListButton"..u.."EnableButton"] + -- if(box and (not box.Panel)) then + -- box:RemoveTextures() + -- box:SetCheckboxTemplate(true, -2, -3) + -- box:SetFrameLevel(box:GetFrameLevel() + 50) + -- end + -- end + + -- for u = 1, NUM_LFR_CHOICE_BUTTONS do + -- local box = _G["LFRQueueFrameSpecificListButton"..u.."EnableButton"] + -- if(box and (not box.Panel)) then + -- box:RemoveTextures() + -- box:SetCheckboxTemplate(true, -2, -3) + -- box:SetFrameLevel(box:GetFrameLevel() + 50) + -- end + -- end LFGListFrame.CategorySelection:RemoveTextures() LFGListFrame.CategorySelection.StartGroupButton:RemoveTextures() diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/macro.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/macro.lua index 29b68b4..e2dce85 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/macro.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/macro.lua @@ -41,16 +41,7 @@ MACRO UI PLUGINR local function MacroUIStyle() if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.macro ~= true then return end - local MacroFrame = _G.MacroFrame; - local MacroFrameCloseButton = _G.MacroFrameCloseButton; - local MacroButtonScrollFrameScrollBar = _G.MacroButtonScrollFrameScrollBar; - local MacroFrameScrollFrameScrollBar = _G.MacroFrameScrollFrameScrollBar; - local MacroPopupScrollFrameScrollBar = _G.MacroPopupScrollFrameScrollBar; - - local MacroPopupScrollFrame = _G.MacroPopupScrollFrame; - local MacroPopupFrame = _G.MacroPopupFrame; - local MacroFrameSelectedMacroButton = _G.MacroFrameSelectedMacroButton; - local MacroFrameSelectedMacroButtonIcon = _G.MacroFrameSelectedMacroButtonIcon; + PLUGIN:ApplyWindowStyle(MacroFrame, true) PLUGIN:ApplyCloseButtonStyle(MacroFrameCloseButton) PLUGIN:ApplyScrollFrameStyle(MacroButtonScrollFrameScrollBar) @@ -59,11 +50,16 @@ local function MacroUIStyle() MacroFrame:Width(360) + local parentStrata = MacroFrame:GetFrameStrata() + local parentLevel = MacroFrame:GetFrameLevel() + for i = 1, #MacroButtonList do local button = _G[MacroButtonList[i]] if(button) then + button:SetFrameStrata(parentStrata) + button:SetFrameLevel(parentLevel + 1) button:RemoveTextures() - button:SetButtonTemplate() + button:SetButtonTemplate(false, 1, 1, 1) end end @@ -89,9 +85,6 @@ local function MacroUIStyle() end end - MacroFrame:RemoveTextures() - MacroFrame:SetPanelTemplate("Action") - MacroFrame.Panel:SetPoint("BOTTOMRIGHT",MacroFrame,"BOTTOMRIGHT",0,-25) MacroFrameText:SetFont(SV.Media.font.roboto, 10, "OUTLINE") MacroFrameTextBackground:RemoveTextures() MacroFrameTextBackground:SetBasicPanel() @@ -103,60 +96,61 @@ local function MacroUIStyle() MacroPopupScrollFrame:SetPanelTemplate("Pattern") MacroPopupScrollFrame.Panel:Point("TOPLEFT", 51, 2) MacroPopupScrollFrame.Panel:Point("BOTTOMRIGHT", -4, 4) - MacroButtonScrollFrame:SetBasicPanel() MacroPopupEditBox:SetEditboxTemplate() MacroPopupNameLeft:SetTexture(0,0,0,0) MacroPopupNameMiddle:SetTexture(0,0,0,0) MacroPopupNameRight:SetTexture(0,0,0,0) MacroFrameInset:Die() - MacroEditButton:ClearAllPoints() - MacroEditButton:Point("BOTTOMLEFT", MacroFrameSelectedMacroButton, "BOTTOMRIGHT", 10, 0) + MacroButtonContainer:RemoveTextures() PLUGIN:ApplyScrollFrameStyle(MacroButtonScrollFrame) + MacroButtonScrollFrame:SetFixedPanelTemplate("Inset") MacroPopupFrame:HookScript("OnShow", function(c) c:ClearAllPoints() c:Point("TOPLEFT", MacroFrame, "TOPRIGHT", 5, -2) end) + MacroFrameSelectedMacroButton:SetFrameStrata(parentStrata) + MacroFrameSelectedMacroButton:SetFrameLevel(parentLevel + 1) MacroFrameSelectedMacroButton:RemoveTextures() - MacroFrameSelectedMacroButton:SetSlotTemplate() + MacroFrameSelectedMacroButton:SetSlotTemplate(true) MacroFrameSelectedMacroButtonIcon:SetTexCoord(0.1, 0.9, 0.1, 0.9) MacroFrameSelectedMacroButtonIcon:FillInner() + + MacroEditButton:ClearAllPoints() + MacroEditButton:Point("BOTTOMLEFT", MacroFrameSelectedMacroButton.Panel, "BOTTOMRIGHT", 10, 0) + MacroFrameCharLimitText:ClearAllPoints() MacroFrameCharLimitText:Point("BOTTOM", MacroFrameTextBackground, -25, -35) - for b = 1, MAX_ACCOUNT_MACROS do - local d = _G["MacroButton"..b] - local e = _G["MacroButton"..b.."Icon"] - local f = _G["MacroPopupButton"..b] - local g = _G["MacroPopupButton"..b.."Icon"] - if d then - d:RemoveTextures() - d:SetButtonTemplate() - local level = d:GetFrameLevel() - if(level > 0) then - d.Panel:SetFrameLevel(level - 1) - else - d.Panel:SetFrameLevel(0) + for i = 1, MAX_ACCOUNT_MACROS do + local button = _G["MacroButton"..i] + if(button) then + button:RemoveTextures() + button:SetSlotTemplate() + + local icon = _G["MacroButton"..i.."Icon"] + if(icon) then + icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + icon:FillInner() + icon:SetDrawLayer("OVERLAY") end - d:SetBackdropColor(0, 0, 0, 0) - end - if e then - e:SetTexCoord(0.1, 0.9, 0.1, 0.9) - e:FillInner() - e:SetDrawLayer("OVERLAY") - end - if f then - f:RemoveTextures() - f:SetButtonTemplate() - f:SetBackdropColor(0, 0, 0, 0) - end - if g then - g:SetTexCoord(0.1, 0.9, 0.1, 0.9) - g:FillInner() - end + + local popup = _G["MacroPopupButton"..i] + if(popup) then + popup:RemoveTextures() + popup:SetButtonTemplate() + popup:SetBackdropColor(0, 0, 0, 0) + + local popupIcon = _G["MacroPopupButton"..i.."Icon"] + if(popupIcon) then + popupIcon:FillInner() + popupIcon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + end + end + end end end