From 3ced5b716bfc6385c5f7cff34fb2f735cf009dfd Mon Sep 17 00:00:00 2001 From: Matthew Rodrigues <38044816+mattcapazz@users.noreply.github.com> Date: Fri, 30 Jun 2023 22:14:31 -0700 Subject: [PATCH 1/4] re-added og classes paging --- ElvUI/Settings/Profile.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ElvUI/Settings/Profile.lua b/ElvUI/Settings/Profile.lua index 8b1986a..ed70c45 100644 --- a/ElvUI/Settings/Profile.lua +++ b/ElvUI/Settings/Profile.lua @@ -4017,12 +4017,15 @@ P.actionbar = { inheritGlobalFade = false, showGrid = true, paging = { + DRUID = "[bonusbar:1,nostealth] 7; [bonusbar:1,stealth] 8; [bonusbar:2] 8; [bonusbar:3] 9; [bonusbar:4] 10;", HERO = "[bonusbar:1,nostealth] 7; [bonusbar:1,stealth] 8; [bonusbar:2] 8; [bonusbar:3] 9; [bonusbar:4] 10;", + PRIEST = "[bonusbar:1] 7;", PROPHET = "[stealth] 7; [nostealth] 1;", RANGER = "[stealth] 7; [nostealth] 1;", REAPER = "[stealth] 7; [nostealth] 1;", - ROGUE = "[stealth] 7; [nostealth] 1;", + ROGUE = "[bonusbar:1] 7; [form:3] 7;", SPIRITMAGE = "[stealth] 7; [nostealth] 1;", + WARRIOR = "[bonusbar:1] 7; [bonusbar:2] 8; [bonusbar:3] 9;", }, visibility = "" }, From e54c3efbd04cf6af52c2506136fe3879d781e466 Mon Sep 17 00:00:00 2001 From: andrew6180 <16847730+andrew6180@users.noreply.github.com> Date: Mon, 3 Jul 2023 18:42:58 -0700 Subject: [PATCH 2/4] Modules/Auras: make auras linkable in chat --- ElvUI/Core/Core.lua | 4 ++-- ElvUI/Modules/ActionBars/ActionBars.lua | 4 +--- ElvUI/Modules/Auras/Auras.lua | 16 ++++++++++++++-- ElvUI/Settings/Profile.lua | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ElvUI/Core/Core.lua b/ElvUI/Core/Core.lua index 8e17924..bc6a2d9 100644 --- a/ElvUI/Core/Core.lua +++ b/ElvUI/Core/Core.lua @@ -54,7 +54,7 @@ E.noop = function() end E.title = format("|cff1784d1E|r|cffe5e3e3lvUI|r") E.myfaction, E.myLocalizedFaction = UnitFactionGroup("player") E.mylevel = UnitLevel("player") -E.myLocalizedClass, E.myclass = UnitClass("player") +E.myLocalizedClass, E.myclass = UnitClass("player") -- On Ascension, this is always (Hero, HERO) E.myLocalizedRace, E.myrace = UnitRace("player") E.myname = UnitName("player") E.myrealm = GetRealmName() @@ -1243,4 +1243,4 @@ function E:Initialize() if GetCVar("scriptProfile") ~= "1" then collectgarbage("collect") end -end +end \ No newline at end of file diff --git a/ElvUI/Modules/ActionBars/ActionBars.lua b/ElvUI/Modules/ActionBars/ActionBars.lua index 2ce2ba9..8e05dcf 100644 --- a/ElvUI/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Modules/ActionBars/ActionBars.lua @@ -376,9 +376,7 @@ function AB:CreateVehicleLeave() vehicle:SetScript("OnClick", Vehicle_ExitVehicle) vehicle:SetScript("OnEvent", Vehicle_OnEvent) - if MainMenuBarVehicleLeaveButtonMixin then - vehicle:SetScript("OnEnter", MainMenuBarVehicleLeaveButtonMixin.OnEnter) - end + vehicle:SetScript("OnEnter", MainMenuBarVehicleLeaveButtonMixin.OnEnter) vehicle:SetScript("OnLeave", GameTooltip_Hide) vehicle:RegisterEvent("PLAYER_ENTERING_WORLD") vehicle:RegisterEvent("UPDATE_BONUS_ACTIONBAR") diff --git a/ElvUI/Modules/Auras/Auras.lua b/ElvUI/Modules/Auras/Auras.lua index e30d812..82afbc5 100644 --- a/ElvUI/Modules/Auras/Auras.lua +++ b/ElvUI/Modules/Auras/Auras.lua @@ -121,7 +121,19 @@ local OnLeave = function() GameTooltip:Hide() end -local OnClick = function(self) +local OnClick = function(self, button) + if button == "LeftButton" then + if IsModifiedClick("CHATLINK") then + local spellID = select(11, UnitAura("player", self:GetID(), self:GetParent().filter)) + if spellID then + local link = LinkUtil:GetSpellLink(spellID) + if link then + ChatEdit_InsertLink(link) + end + end + end + return + end if self.IsWeapon then CancelItemTempEnchantment(self:GetID()) else @@ -140,7 +152,7 @@ function A:CreateIcon(button) button.auraType = "buffs" end - button:RegisterForClicks("RightButtonUp") + button:RegisterForClicks("LeftButtonUp", "RightButtonUp") button.texture = button:CreateTexture(nil, "BORDER") button.texture:SetInside() diff --git a/ElvUI/Settings/Profile.lua b/ElvUI/Settings/Profile.lua index ed70c45..03ec9bc 100644 --- a/ElvUI/Settings/Profile.lua +++ b/ElvUI/Settings/Profile.lua @@ -4204,4 +4204,4 @@ do -- cooldown stuff -- we gonna need this on by default :3 P.cooldown.enable = true -end +end \ No newline at end of file From 6afa9a9bbfbafef43f1c0dd217547037ff63b050 Mon Sep 17 00:00:00 2001 From: andrew6180 <16847730+andrew6180@users.noreply.github.com> Date: Mon, 3 Jul 2023 18:55:42 -0700 Subject: [PATCH 3/4] UnitFrames/Player: dont add rage/energy bar to height if not hero --- ElvUI/Modules/UnitFrames/Units/Player.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Modules/UnitFrames/Units/Player.lua b/ElvUI/Modules/UnitFrames/Units/Player.lua index 2270b3d..14a473f 100644 --- a/ElvUI/Modules/UnitFrames/Units/Player.lua +++ b/ElvUI/Modules/UnitFrames/Units/Player.lua @@ -80,7 +80,7 @@ function UF:Update_PlayerFrame(frame, db) frame.POWERBAR_WIDTH = frame.USE_MINI_POWERBAR and (frame.UNIT_WIDTH - (frame.BORDER*2))/2 or (frame.POWERBAR_DETACHED and db.power.detachedWidth or (frame.UNIT_WIDTH - ((frame.BORDER+frame.SPACING)*2))) -- Energy - frame.USE_ENERGYBAR = db.energy.enable + frame.USE_ENERGYBAR = db.energy.enable and E.myclass == "HERO" frame.ENERGYBAR_DETACHED = db.energy.detachFromFrame frame.USE_INSET_ENERGYBAR = not frame.ENERGYBAR_DETACHED and db.energy.width == "inset" and frame.USE_ENERGYBAR frame.USE_MINI_ENERGYBAR = (not frame.ENERGYBAR_DETACHED and db.energy.width == "spaced" and frame.USE_ENERGYBAR) @@ -91,7 +91,7 @@ function UF:Update_PlayerFrame(frame, db) frame.ENERGYBAR_WIDTH = frame.USE_MINI_ENERGYBAR and (frame.UNIT_WIDTH - (frame.BORDER*2))/2 or (frame.ENERGYBAR_DETACHED and db.energy.detachedWidth or (frame.UNIT_WIDTH - ((frame.BORDER+frame.SPACING)*2))) -- Rage - frame.USE_RAGEBAR = db.rage.enable + frame.USE_RAGEBAR = db.rage.enable and E.myclass == "HERO" frame.RAGEBAR_DETACHED = db.rage.detachFromFrame frame.USE_INSET_RAGEBAR = not frame.RAGEBAR_DETACHED and db.rage.width == "inset" and frame.USE_RAGEBAR frame.USE_MINI_RAGEBAR = (not frame.RAGEBAR_DETACHED and db.rage.width == "spaced" and frame.USE_RAGEBAR) From 02e23c001f86626c4b6977408a3f7ba25518f554 Mon Sep 17 00:00:00 2001 From: andrew6180 <16847730+andrew6180@users.noreply.github.com> Date: Mon, 3 Jul 2023 18:58:34 -0700 Subject: [PATCH 4/4] 7.3 --- ElvUI/ElvUI.toc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/ElvUI.toc b/ElvUI/ElvUI.toc index 5aecd6a..1ffc854 100644 --- a/ElvUI/ElvUI.toc +++ b/ElvUI/ElvUI.toc @@ -1,6 +1,6 @@ ## Interface: 30300 ## Author: Elv, Bunny -## Version: 7.2 +## Version: 7.3 ## Title: |cff1784d1E|r|cffe5e3e3lvUI|r ## Notes: User Interface replacement AddOn for World of Warcraft. ## SavedVariables: ElvDB, ElvPrivateDB