diff --git a/Interface/AddOns/SVUI/libs/LibActionButton-1.0/LibActionButton-1.0.lua b/Interface/AddOns/SVUI/libs/LibActionButton-1.0/LibActionButton-1.0.lua index 80256bf..a3773e7 100644 --- a/Interface/AddOns/SVUI/libs/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/Interface/AddOns/SVUI/libs/LibActionButton-1.0/LibActionButton-1.0.lua @@ -794,7 +794,7 @@ function OnUpdate(_, elapsed) if rangeTimer <= 0 then local inRange = button:IsInRange() local oldRange = button.outOfRange - button.outOfRange = (inRange == 0) + button.outOfRange = (inRange == false) if oldRange ~= button.outOfRange then if button.config.outOfRangeColoring == "button" then UpdateUsable(button) @@ -807,7 +807,7 @@ function OnUpdate(_, elapsed) hotkey:Hide() end end - if inRange == 0 then + if button.outOfRange then hotkey:SetVertexColor(unpack(button.config.colors.range)) else hotkey:SetVertexColor(0.6, 0.6, 0.6) diff --git a/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/range.lua b/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/range.lua index 5978aac..a8ce0b6 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/range.lua +++ b/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/range.lua @@ -150,6 +150,10 @@ local function petIsInRange(unit) end local function enemyIsInRange(unit) + if CheckInteractDistance(unit, 2) then + return true + end + for _, name in ipairs(enemySpells) do if IsSpellInRange(name, unit) == 1 then return true diff --git a/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua b/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua index 9be7bdd..0f85b3f 100644 --- a/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua +++ b/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua @@ -268,6 +268,7 @@ local function SaveActionButton(parent) MOD.ButtonCache[parent] = true end parent:SetSlotTemplate(true, 2, 0, 0, 0.75) + parent:SetCheckedTexture("") end local function SetFlyoutButton(button) @@ -878,6 +879,8 @@ function MOD:RefreshActionBars() self:RefreshBar("Pet") self:RefreshBar("Stance") self:UpdateBarBindings(true, true) + + collectgarbage("collect"); end local Vehicle_Updater = function() @@ -1425,6 +1428,12 @@ local CreateExtraBar = function(self) if HasExtraActionBar()then ExtraActionBarFrame:Show() end + + DraenorZoneAbilityFrame:SetParent(specialBar) + DraenorZoneAbilityFrame:ClearAllPoints() + DraenorZoneAbilityFrame:SetPoint('CENTER', specialBar, 'CENTER') + DraenorZoneAbilityFrame.ignoreFramePositionManager = true + SV.Mentalo:Add(specialBar, L["Boss Button"], nil, nil, nil, "ALL, ACTIONBAR") end --[[ diff --git a/Interface/AddOns/SVUI/packages/chat/SVChat.lua b/Interface/AddOns/SVUI/packages/chat/SVChat.lua index 8ffc834..33b6b33 100644 --- a/Interface/AddOns/SVUI/packages/chat/SVChat.lua +++ b/Interface/AddOns/SVUI/packages/chat/SVChat.lua @@ -727,9 +727,9 @@ do chat.Panel:Hide() if id == 1 then chat:ClearAllPoints() - chat:Width(CHAT_WIDTH - 12) + chat:Width(CHAT_WIDTH) chat:Height(CHAT_HEIGHT) - chat:Point("BOTTOMRIGHT",SuperDockWindowLeft,"BOTTOMRIGHT",-6,10) + chat:Point("BOTTOMRIGHT",SuperDockWindowLeft,"BOTTOMRIGHT",-4,10) FCF_SavePositionAndDimensions(chat) end chat:SetParent(SuperDockWindowLeft) diff --git a/Interface/AddOns/SVUI/packages/stats/SVStats.lua b/Interface/AddOns/SVUI/packages/stats/SVStats.lua index 873f69c..4718289 100644 --- a/Interface/AddOns/SVUI/packages/stats/SVStats.lua +++ b/Interface/AddOns/SVUI/packages/stats/SVStats.lua @@ -232,7 +232,11 @@ function MOD:NewAnchor(parent, maxCount, tipAnchor, isTop, customTemplate, isVer if(SV.db.SVStats.showBackground) then parent.holders[position].barframe:Point("TOPLEFT", parent.holders[position], "TOPLEFT", 24, -2) parent.holders[position].barframe:Point("BOTTOMRIGHT", parent.holders[position], "BOTTOMRIGHT", -2, 2) - parent.holders[position]:SetFramedButtonTemplate(template) + if(customTemplate) then + parent.holders[position]:SetFixedPanelTemplate(template) + else + parent.holders[position]:SetFramedButtonTemplate(template) + end else parent.holders[position].barframe:Point("TOPLEFT", parent.holders[position], "TOPLEFT", 24, 2) parent.holders[position].barframe:Point("BOTTOMRIGHT", parent.holders[position], "BOTTOMRIGHT", 2, -2) diff --git a/Interface/AddOns/SVUI/packages/unit/elements/auras.lua b/Interface/AddOns/SVUI/packages/unit/elements/auras.lua index 2427428..e2c8e01 100644 --- a/Interface/AddOns/SVUI/packages/unit/elements/auras.lua +++ b/Interface/AddOns/SVUI/packages/unit/elements/auras.lua @@ -124,7 +124,7 @@ end local PostCreateAuraIcon = function(self, aura) aura.cd.noOCC = true; aura.cd.noCooldownCount = true; - aura.cd:SetReverse() + aura.cd:SetReverse(true) aura.overlay:SetTexture(0,0,0,0) aura.stealable:SetTexture(0,0,0,0) @@ -236,7 +236,7 @@ local PostUpdateAuraIcon = function(self, unit, button, index, offset) local name, _, _, _, dtype, duration, expiration, _, isStealable = UnitAura(unit, index, button.filter) local isFriend = UnitIsFriend('player', unit) == 1 and true or false if button.isDebuff then - if(not isFriend and button.owner ~= "player" and button.owner ~= "vehicle") then + if(not isFriend and button.owner and button.owner ~= "player" and button.owner ~= "vehicle") then button:SetBackdropBorderColor(0.9, 0.1, 0.1) button.icon:SetDesaturated((unit and not unit:find('arena%d')) and true or false) else diff --git a/Interface/AddOns/SVUI/scripts/mounts.lua b/Interface/AddOns/SVUI/scripts/mounts.lua index 16259c1..0f139d5 100644 --- a/Interface/AddOns/SVUI/scripts/mounts.lua +++ b/Interface/AddOns/SVUI/scripts/mounts.lua @@ -42,7 +42,7 @@ LOCAL VARIABLES ]]-- local ttSummary = ""; local NewHook = hooksecurefunc; -local CountMounts, MountInfo, RandomMount, MountUp, UnMount, CHECKED, UNCHECKED; +local CountMounts, MountInfo, RandomMount, MountUp, UnMount; local MountListener = CreateFrame("Frame"); MountListener.favorites = false @@ -51,46 +51,24 @@ MountListener.favorites = false LOCAL FUNCTIONS ########################################################## ]]-- -if(select(4, GetBuildInfo()) >= 60000) then - CHECKED = true; - UNCHECKED = false; - function CountMounts() - return C_MountJournal.GetNumMounts() - end - function MountInfo(index) - return true, C_MountJournal.GetMountInfo(index) - end - function RandomMount() - if(MountListener.favorites) then - return 0 - end - maxMounts = C_MountJournal.GetNumMounts() - return random(1, maxMounts) - end - function MountUp(index) - index = index or RandomMount() - return C_MountJournal.Summon(index) - end - UnMount = C_MountJournal.Dismiss -else - CHECKED = 1; - UNCHECKED = 0; - function CountMounts() - return GetNumCompanions("MOUNT") - end - function MountInfo(index) - return GetCompanionInfo("MOUNT", index) - end - function RandomMount() - maxMounts = GetNumCompanions("MOUNT") - return random(1, maxMounts) - end - function MountUp(index) - index = index or RandomMount() - return CallCompanion("MOUNT", index) +function CountMounts() + return C_MountJournal.GetNumMounts() +end +function MountInfo(index) + return true, C_MountJournal.GetMountInfo(index) +end +function RandomMount() + if(MountListener.favorites) then + return 0 end - UnMount = Dismount + maxMounts = C_MountJournal.GetNumMounts() + return random(1, maxMounts) +end +function MountUp(index) + index = index or RandomMount() + return C_MountJournal.Summon(index) end +UnMount = C_MountJournal.Dismiss local function UpdateMountCheckboxes(button, index) local _, creatureName = MountInfo(index); @@ -112,36 +90,36 @@ local function UpdateMountCheckboxes(button, index) if(SV.cache.Mounts.types["GROUND"] ~= index) then SV.cache.Mounts.types["GROUND"] = index end - bar["GROUND"]:SetChecked(CHECKED) + bar["GROUND"]:SetChecked(true) else - bar["GROUND"]:SetChecked(UNCHECKED) + bar["GROUND"]:SetChecked(false) end if(SV.cache.Mounts.names["FLYING"] == creatureName) then if(SV.cache.Mounts.types["FLYING"] ~= index) then SV.cache.Mounts.types["FLYING"] = index end - bar["FLYING"]:SetChecked(CHECKED) + bar["FLYING"]:SetChecked(true) else - bar["FLYING"]:SetChecked(UNCHECKED) + bar["FLYING"]:SetChecked(false) end if(SV.cache.Mounts.names["SWIMMING"] == creatureName) then if(SV.cache.Mounts.types["SWIMMING"] ~= index) then SV.cache.Mounts.types["SWIMMING"] = index end - bar["SWIMMING"]:SetChecked(CHECKED) + bar["SWIMMING"]:SetChecked(true) else - bar["SWIMMING"]:SetChecked(UNCHECKED) + bar["SWIMMING"]:SetChecked(false) end if(SV.cache.Mounts.names["SPECIAL"] == creatureName) then if(SV.cache.Mounts.types["SPECIAL"] ~= index) then SV.cache.Mounts.types["SPECIAL"] = index end - bar["SPECIAL"]:SetChecked(CHECKED) + bar["SPECIAL"]:SetChecked(true) else - bar["SPECIAL"]:SetChecked(UNCHECKED) + bar["SPECIAL"]:SetChecked(false) end end end @@ -327,7 +305,7 @@ local function SetMountCheckButtons() buttonBar["GROUND"]:SetPanelColor(0.2, 0.7, 0.1, 0.15) buttonBar["GROUND"]:GetCheckedTexture():SetVertexColor(0.2, 0.7, 0.1, 1) buttonBar["GROUND"].key = "GROUND" - buttonBar["GROUND"]:SetChecked(UNCHECKED) + buttonBar["GROUND"]:SetChecked(false) buttonBar["GROUND"]:SetScript("OnClick", CheckButton_OnClick) buttonBar["GROUND"]:SetScript("OnEnter", CheckButton_OnEnter) buttonBar["GROUND"]:SetScript("OnLeave", CheckButton_OnLeave) @@ -340,7 +318,7 @@ local function SetMountCheckButtons() buttonBar["FLYING"]:SetPanelColor(1, 1, 0.2, 0.15) buttonBar["FLYING"]:GetCheckedTexture():SetVertexColor(1, 1, 0.2, 1) buttonBar["FLYING"].key = "FLYING" - buttonBar["FLYING"]:SetChecked(UNCHECKED) + buttonBar["FLYING"]:SetChecked(false) buttonBar["FLYING"]:SetScript("OnClick", CheckButton_OnClick) buttonBar["FLYING"]:SetScript("OnEnter", CheckButton_OnEnter) buttonBar["FLYING"]:SetScript("OnLeave", CheckButton_OnLeave) @@ -353,7 +331,7 @@ local function SetMountCheckButtons() buttonBar["SWIMMING"]:SetPanelColor(0.2, 0.42, 0.76, 0.15) buttonBar["SWIMMING"]:GetCheckedTexture():SetVertexColor(0.2, 0.42, 0.76, 1) buttonBar["SWIMMING"].key = "SWIMMING" - buttonBar["SWIMMING"]:SetChecked(UNCHECKED) + buttonBar["SWIMMING"]:SetChecked(false) buttonBar["SWIMMING"]:SetScript("OnClick", CheckButton_OnClick) buttonBar["SWIMMING"]:SetScript("OnEnter", CheckButton_OnEnter) buttonBar["SWIMMING"]:SetScript("OnLeave", CheckButton_OnLeave) @@ -366,7 +344,7 @@ local function SetMountCheckButtons() buttonBar["SPECIAL"]:SetPanelColor(0.7, 0.1, 0.1, 0.15) buttonBar["SPECIAL"]:GetCheckedTexture():SetVertexColor(0.7, 0.1, 0.1, 1) buttonBar["SPECIAL"].key = "SPECIAL" - buttonBar["SPECIAL"]:SetChecked(UNCHECKED) + buttonBar["SPECIAL"]:SetChecked(false) buttonBar["SPECIAL"]:SetScript("OnClick", CheckButton_OnClick) buttonBar["SPECIAL"]:SetScript("OnEnter", CheckButton_OnEnter) buttonBar["SPECIAL"]:SetScript("OnLeave", CheckButton_OnLeave) diff --git a/Interface/AddOns/SVUI/system/alerts.lua b/Interface/AddOns/SVUI/system/alerts.lua index 984461f..a4bcfef 100644 --- a/Interface/AddOns/SVUI/system/alerts.lua +++ b/Interface/AddOns/SVUI/system/alerts.lua @@ -259,7 +259,7 @@ SV.SystemAlert["CONFIRM_LOSE_BINDING_CHANGES"] = { end, OnCancel = function(a) if SVUI_KeyBindPopupCheckButton:GetChecked()then - SVUI_KeyBindPopupCheckButton:SetChecked() + SVUI_KeyBindPopupCheckButton:SetChecked(false) else SVUI_KeyBindPopupCheckButton:SetChecked(true) end diff --git a/Interface/AddOns/SVUI/system/common.lua b/Interface/AddOns/SVUI/system/common.lua index 473e1b5..122ff40 100644 --- a/Interface/AddOns/SVUI/system/common.lua +++ b/Interface/AddOns/SVUI/system/common.lua @@ -783,7 +783,7 @@ APPENDED BUTTON TEMPLATING METHODS ########################################################## ]]-- local function SetButtonTemplate(self, invisible, overridePadding, xOffset, yOffset, keepNormal, defaultColor) - if(not self) then return end + if(not self or (self and self.Panel)) then return end local padding = 1 if(overridePadding and type(overridePadding) == "number") then @@ -802,6 +802,12 @@ local function SetButtonTemplate(self, invisible, overridePadding, xOffset, yOff CreatePanelTemplate(self, "Transparent", underlay, true, padding, x, y, defaultColor) self:SetBackdropColor(0,0,0,0) self:SetBackdropBorderColor(0,0,0,0) + if(self.Panel.BorderLeft) then + self.Panel.BorderLeft:SetVertexColor(0,0,0,0) + self.Panel.BorderRight:SetVertexColor(0,0,0,0) + self.Panel.BorderTop:SetVertexColor(0,0,0,0) + self.Panel.BorderBottom:SetVertexColor(0,0,0,0) + end else CreatePanelTemplate(self, "Button", underlay, true, padding, x, y, defaultColor) end @@ -869,7 +875,7 @@ local function SetButtonTemplate(self, invisible, overridePadding, xOffset, yOff end local function SetSlotTemplate(self, underlay, padding, x, y, shadowAlpha) - if(not self) then return end + if(not self or (self and self.Panel)) then return end padding = padding or 1 CreatePanelTemplate(self, "Slot", underlay, true, padding, x, y) CreateButtonPanel(self, true) diff --git a/Interface/AddOns/SVUI/system/configs.lua b/Interface/AddOns/SVUI/system/configs.lua index 7becf07..0ba0b51 100644 --- a/Interface/AddOns/SVUI/system/configs.lua +++ b/Interface/AddOns/SVUI/system/configs.lua @@ -190,7 +190,7 @@ SV.configs["SVBar"] = { ["ROGUE"] = "[stance:1] 7; [stance:2] 7; [stance:3] 7; [bonusbar:1] 7; [form:3] 7;", ["DRUID"] = "[bonusbar:1, nostealth] 7; [bonusbar:1, stealth] 8; [bonusbar:2] 8; [bonusbar:3] 9; [bonusbar:4] 10;", ["SHAMAN"] = "", - ["WARRIOR"] = "", + ["WARRIOR"] = "[bonusbar:1] 7; [bonusbar:2] 8;", ["DEATHKNIGHT"] = "", ["MONK"] = "[bonusbar:1] 7; [bonusbar:2] 8; [bonusbar:3] 9;", }, @@ -697,8 +697,8 @@ SV.configs["SVUnit"] = { ["auraFontSize"] = 12, ["auraFontOutline"] = "OUTLINE", - ["OORAlpha"] = 0.65, - ["groupOORAlpha"] = 0.45, + ["OORAlpha"] = 0.4, + ["groupOORAlpha"] = 0.2, ["combatFadeRoles"] = true, ["combatFadeNames"] = true, ["debuffHighlighting"] = true, @@ -3582,7 +3582,7 @@ local FilterIDs = { ["Blocked"] = [[36900,36901,36893,114216,97821,36032,132365,8733,57724,25771,57723,36032,58539,26013,6788,71041,41425,55711,8326,23445,24755,25163,80354,95809,95223,124275,124274,124273,117870,123981,15007,113942,89140]], ["Allowed"] = [[31821,2825,32182,80353,90355,47788,33206,116849,22812,1490,116202,123059,136431,137332,137375,144351,142863,142864,142865,143198]], ["Strict"] = [[123059,136431,137332,137375,144351,142863,142864,142865,143198]], - ["CC"] = [[47476,91800,91807,91797,108194,115001,33786,2637,339,78675,22570,5211,9005,102359,99,127797,45334,102795,114238,113004,3355,1513,19503,34490,24394,64803,19386,117405,128405,50519,91644,90337,54706,4167,90327,56626,50245,50541,96201,96201,31661,118,55021,122,82691,118271,44572,33395,102051,20066,10326,853,105593,31935,105421,605,64044,8122,9484,15487,114404,88625,113792,87194,2094,1776,6770,1833,51722,1330,408,88611,115197,113953,51514,64695,63685,76780,118905,118345,710,6789,118699,5484,6358,30283,24259,115782,115268,118093,89766,137143,20511,7922,676,105771,107566,132168,107570,118895,18498,116706,117368,115078,122242,119392,119381,120086,116709,123407,140023,25046,20549,107079]], + ["CC"] = [[47476,91800,91807,91797,108194,115001,33786,339,78675,22570,5211,102359,99,127797,45334,114238,3355,24394,64803,19386,117405,128405,31661,118,122,82691,44572,33395,102051,20066,10326,853,105593,31935,105421,605,64044,8122,9484,15487,114404,88625,87194,2094,1776,6770,1833,1330,408,88611,51514,64695,63685,118905,118345,710,6789,118699,5484,6358,30283,115268,89766,137143,7922,105771,107566,132168,107570,118895,18498,116706,115078,119392,119381,120086,140023,25046,20549,107079]], ["Shield"] = [[17,47515,45243,45438,115610,48797,48792,49039,87256,55233,50461,33206,47788,62618,47585,104773,110913,108359,22812,102342,106922,61336,19263,53480,1966,31224,74001,5277,45182,98007,30823,108271,1022,6940,114039,31821,498,642,86659,31850,118038,55694,97463,12975,114029,871,114030,120954,131523,122783,122278,115213,116849,20594]], ["Player"] = [[17,47515,45243,45438,45438,115610,110909,12051,12472,80353,12042,32612,110960,108839,111264,108843,48797,48792,49039,87256,49222,55233,50461,49016,51271,96268,33206,47788,62618,47585,6346,10060,114239,119032,27827,104773,110913,108359,113860,113861,113858,88448,22812,102342,106922,61336,117679,102543,102558,102560,16689,132158,106898,1850,106951,29166,52610,69369,112071,124974,19263,53480,51755,54216,34471,3045,3584,131894,90355,90361,31224,74001,5277,45182,51713,114018,2983,121471,11327,108212,57933,79140,13750,98007,30823,108271,16188,2825,79206,16191,8178,58875,108281,108271,16166,114896,1044,1022,1038,6940,114039,31821,498,642,86659,20925,31850,31884,53563,31842,54428,105809,85499,118038,55694,97463,12975,114029,871,114030,18499,1719,23920,114028,46924,3411,107574,120954,131523,122783,122278,115213,116849,125174,116841,20594,59545,20572,26297,68992]], ["Raid"] = [[116281,116784,116417,116942,116161,117708,118303,118048,118135,117878,117949,116835,116778,116525,122761,122760,122740,123812,123180,123474,122835,123081,122125,121885,121949,117436,118091,117519,122752,123011,116161,123121,119985,119086,119775,122151,138349,137371,136767,137641,137359,137972,136903,136753,137633,137731,133767,133768,136050,138569,134691,137440,137408,137360,135000,143436,143579,147383,146124,144851,144358,144774,147207,144215,143990,144330,143494,142990,143919,143766,143773,146589,143777,143385,143974,145183]] diff --git a/Interface/AddOns/SVUI_ConfigOMatic/components/bar.lua b/Interface/AddOns/SVUI_ConfigOMatic/components/bar.lua index 94cc304..cd8150c 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/components/bar.lua +++ b/Interface/AddOns/SVUI_ConfigOMatic/components/bar.lua @@ -682,12 +682,12 @@ SV.Options.args.SVBar = { name = L["Out of Range"], desc = L["Color of the actionbutton when out of range."], hasAlpha = true, - get = function(key) - local color = SV.db.SVBar[key[#key]] - return color[1], color[2], color[3], color[4] - end, + get = function(key) return unpack(SV.db.SVBar[key[#key]]) end, set = function(key, rValue, gValue, bValue, aValue) - SV.db.SVBar[key[#key]] = {rValue, gValue, bValue, aValue} + SV.db.SVBar[key[#key]][1] = rValue + SV.db.SVBar[key[#key]][2] = gValue + SV.db.SVBar[key[#key]][3] = bValue + SV.db.SVBar[key[#key]][4] = aValue MOD:RefreshActionBars() end, }, @@ -697,12 +697,12 @@ SV.Options.args.SVBar = { name = L["Out of Power"], desc = L["Color of the actionbutton when out of power (Mana, Rage, Focus, Holy Power)."], hasAlpha = true, - get = function(key) - local color = SV.db.SVBar[key[#key]] - return color[1], color[2], color[3], color[4] - end, + get = function(key) return unpack(SV.db.SVBar[key[#key]]) end, set = function(key, rValue, gValue, bValue, aValue) - SV.db.SVBar[key[#key]] = {rValue, gValue, bValue, aValue} + SV.db.SVBar[key[#key]][1] = rValue + SV.db.SVBar[key[#key]][2] = gValue + SV.db.SVBar[key[#key]][3] = bValue + SV.db.SVBar[key[#key]][4] = aValue MOD:RefreshActionBars() end, }, diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/chat.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/chat.lua index bd44ba3..6b4d917 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/chat.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/chat.lua @@ -389,7 +389,7 @@ local function ChatStyle() local name = ChatFrameList2[i] local this = _G[name] if(this) then - this:SetButtonTemplate() + this:RemoveTextures() end end diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua index a6fec9e..a5cd206 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua @@ -40,15 +40,20 @@ local LFDFrameList = { "RaidFinderQueueFrameRoleButtonTank", "LFGInvitePopupRoleButtonTank", "LFGInvitePopupRoleButtonHealer", - "LFGInvitePopupRoleButtonDPS" + "LFGInvitePopupRoleButtonDPS", + }; local Incentive_OnShow = function(button) - ActionButton_ShowOverlayGlow(button:GetParent().checkButton) + local parent = button:GetParent() + local check = parent.checkButton or parent.CheckButton + ActionButton_ShowOverlayGlow(check) end local Incentive_OnHide = function(button) - ActionButton_HideOverlayGlow(button:GetParent().checkButton) + local parent = button:GetParent() + local check = parent.checkButton or parent.CheckButton + ActionButton_HideOverlayGlow(check) end local LFDQueueRandom_OnUpdate = function() @@ -189,9 +194,10 @@ local function LFDFrameStyle() for _,name in pairs(LFDFrameList) do local frame = _G[name]; if frame then - frame.checkButton:RemoveTextures() - frame.checkButton:SetCheckboxTemplate(true, -4, -4) - frame.checkButton:SetFrameLevel(frame.checkButton:GetFrameLevel() + 50) + local check = frame.checkButton or frame.CheckButton + check:RemoveTextures() + check:SetCheckboxTemplate(true, -4, -4) + check:SetFrameLevel(check:GetFrameLevel() + 50) frame:DisableDrawLayer("BACKGROUND") frame:DisableDrawLayer("OVERLAY") end @@ -209,18 +215,24 @@ local function LFDFrameStyle() RaidFinderQueueFrameRoleButtonLeader.leadIcon:SetAlpha(0.4) hooksecurefunc('LFG_DisableRoleButton', function(self) - if self.checkButton:GetChecked() then - self.checkButton:SetAlpha(1) - else - self.checkButton:SetAlpha(0) - end + local check = self.checkButton or self.CheckButton + if(check) then + if check:GetChecked() then + check:SetAlpha(1) + else + check:SetAlpha(0) + end + end if self.background then self.background:Show() end end) hooksecurefunc('LFG_EnableRoleButton', function(self) - self.checkButton:SetAlpha(1) + local check = self.checkButton or self.CheckButton + if(check) then + check:SetAlpha(1) + end end) hooksecurefunc("LFG_PermanentlyDisableRoleButton", function(self) diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/system.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/system.lua index d3e44a3..e31e70d 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/system.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/system.lua @@ -386,6 +386,7 @@ local SystemFrameList21 = { "InterfaceOptionsCameraPanelFollowSpeedSlider", "InterfaceOptionsMousePanelMouseSensitivitySlider", "InterfaceOptionsMousePanelMouseLookSpeedSlider", + "AddonListScrollFrameScrollBar", "OpacityFrameSlider", }; --[[