add option for ignoring parent scale & not showing pet casts for name…

…plates
wardz · Sep 14, 2024 · 0e4b280 · 0e4b280
1 parent 7699e33
commit 0e4b280
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 9 deletions.
diff --git a/.luacheckrc b/.luacheckrc
@@ -83,6 +83,7 @@ read_globals = {
     "UnitCastingInfo",
     "UnitChannelInfo",
     "UnitIsFriend",
+    "UnitIsOtherPlayersPet",
     "strsplit",
     "C_AddOns",
     "C_Spell",

diff --git a/ClassicCastbars/ClassicCastbars.lua b/ClassicCastbars/ClassicCastbars.lua
@@ -64,6 +64,7 @@ function ClassicCastbars:GetCastbarFrameIfEnabled(unitID)
             if not self.db.nameplate.showForFriendly and isFriendly then return end
             if not self.db.nameplate.showForEnemy and not isFriendly then return end
             if UnitIsUnit("player", unitID) then return end -- personal resource display nameplate
+            if not self.db.nameplate.showForPets and UnitIsOtherPlayersPet(unitID) then return end
         end
 
         return self:GetCastbarFrame(unitID)

diff --git a/ClassicCastbars/core/Frames.lua b/ClassicCastbars/core/Frames.lua
@@ -190,6 +190,7 @@ function ClassicCastbars:SetCastbarStyle(castbar, db, unitID)
     castbar.Text:SetWidth(db.width - 10) -- ensures text gets truncated
     castbar.currWidth = db.width -- avoids having to use a function call later on in OnUpdate
     castbar:SetIgnoreParentAlpha(db.ignoreParentAlpha)
+    castbar:SetIgnoreParentScale(db.ignoreParentScale)
 
     castbar.Border:SetDrawLayer("ARTWORK", 1)
     castbar.BorderShield:SetDrawLayer("ARTWORK", 2)

diff --git a/ClassicCastbars/core/SavedVariables.lua b/ClassicCastbars/core/SavedVariables.lua
@@ -1,14 +1,15 @@
 local _, namespace = ...
 
 namespace.defaultConfig = {
-    version = "45",
+    version = "46",
     locale = GetLocale(),
     usePerCharacterSettings = false,
 
     nameplate = {
         enabled = true,
         showForFriendly = true,
         showForEnemy = true,
+        showForPets = true,
         width = 106,
         height = 11,
         iconSize = 13,
@@ -43,6 +44,7 @@ namespace.defaultConfig = {
         borderPaddingHeight = 1.3,
         borderPaddingWidth = 1.17,
         edgeSizeLSM = 18,
+        ignoreParentScale = false,
     },
 
     target = {
@@ -81,6 +83,7 @@ namespace.defaultConfig = {
         borderPaddingHeight = 1.3,
         borderPaddingWidth = 1.17,
         edgeSizeLSM = 18,
+        ignoreParentScale = false,
     },
 
     focus = {
@@ -119,6 +122,7 @@ namespace.defaultConfig = {
         borderPaddingHeight = 1.3,
         borderPaddingWidth = 1.17,
         edgeSizeLSM = 18,
+        ignoreParentScale = false,
     },
 
     party = {
@@ -157,6 +161,7 @@ namespace.defaultConfig = {
         borderPaddingHeight = 1.3,
         borderPaddingWidth = 1.17,
         edgeSizeLSM = 18,
+        ignoreParentScale = false,
     },
 
     arena = {
@@ -195,6 +200,7 @@ namespace.defaultConfig = {
         borderPaddingHeight = 1.3,
         borderPaddingWidth = 1.17,
         edgeSizeLSM = 18,
+        ignoreParentScale = false,
     },
 
     player = {
@@ -234,5 +240,6 @@ namespace.defaultConfig = {
         borderPaddingHeight = 1.3,
         borderPaddingWidth = 1.17,
         edgeSizeLSM = 18,
+        ignoreParentScale = false,
     },
 }
diff --git a/ClassicCastbars_Options/ClassicCastbars_Options.lua b/ClassicCastbars_Options/ClassicCastbars_Options.lua
@@ -128,25 +128,33 @@ local function CreateUnitTabGroup(unitID, localizedUnit, order)
                         disabled = ModuleIsDisabled,
                         hidden = unitID ~= "nameplate",
                     },
-                    autoPosition = {
+                    showForPets = {
                         order = 4,
                         width = "full",
+                        name = L.SHOW_FOR_PETS,
+                        type = "toggle",
+                        disabled = ModuleIsDisabled,
+                        hidden = unitID ~= "nameplate",
+                    },
+                    autoPosition = {
+                        order = 5,
+                        width = "full",
                         name = L.AUTO_POS_BAR,
                         desc = unitID ~= "player" and L.AUTO_POS_BAR_TOOLTIP or "",
                         type = "toggle",
                         hidden = unitID == "nameplate" or unitID == "party" or unitID == "arena",
                         disabled = ModuleIsDisabled,
                     },
                     showTimer = {
-                        order = 5,
+                        order = 6,
                         width = "full",
                         name = L.SHOW_TIMER,
                         desc = L.SHOW_TIMER_TOOLTIP,
                         type = "toggle",
                         disabled = ModuleIsDisabled,
                     },
                     showTotalTimer = {
-                        order = 5,
+                        order = 7,
                         width = "full",
                         name = L.SHOW_TOTAL_TIMER,
                         desc = L.SHOW_TOTAL_TIMER_TOOLTIP,
@@ -155,14 +163,14 @@ local function CreateUnitTabGroup(unitID, localizedUnit, order)
                         disabled = ModuleIsDisabled,
                     },
                     showSpark = {
-                        order = 6,
+                        order = 8,
                         width = "full",
                         name = L.SHOW_SPARK,
                         type = "toggle",
                         disabled = ModuleIsDisabled,
                     },
                     showBorderShield = {
-                        order = 7,
+                        order = 9,
                         width = "full",
                         name = L.BORDERSHIELD,
                         desc = L.BORDERSHIELD_TOOLTIP,
@@ -171,17 +179,26 @@ local function CreateUnitTabGroup(unitID, localizedUnit, order)
                         hidden = unitID == "player",
                     },
                     ignoreParentAlpha = {
-                        order = 8,
+                        order = 10,
                         width = "full",
                         name = L.IGNORE_PARENT_ALPHA,
                         desc = L.IGNORE_PARENT_ALPHA_TOOLTIP,
                         type = "toggle",
                         disabled = ModuleIsDisabled,
                         hidden = unitID == "player",
                     },
+                    ignoreParentScale = {
+                        order = 11,
+                        width = "full",
+                        name = L.IGNORE_PARENT_SCALE,
+                        desc = L.IGNORE_PARENT_SCALE_TOOLTIP,
+                        type = "toggle",
+                        disabled = ModuleIsDisabled,
+                        hidden = unitID == "player",
+                    },
                     posX = {
                         -- Position slider X for nameplate castbars only
-                        order = 10,
+                        order = 12,
                         name = L.POS_X,
                         desc = L.POSXY_TOOLTIP,
                         width = 2,
@@ -201,7 +218,7 @@ local function CreateUnitTabGroup(unitID, localizedUnit, order)
                     },
                     posY = {
                         -- Position slider Y for nameplate castbars only
-                        order = 11,
+                        order = 13,
                         name = L.POS_Y,
                         desc = L.POSXY_TOOLTIP,
                         width = 2,

diff --git a/ClassicCastbars_Options/Locales/enUS.lua b/ClassicCastbars_Options/Locales/enUS.lua
@@ -48,6 +48,8 @@ L["ICON_SIZE"] = "Icon Size"
 L["ICON_SIZE_TOOLTIP"] = "Sets the size for the castbar spell icon."
 L["IGNORE_PARENT_ALPHA"] = "Ignore Parent Frame Alpha"
 L["IGNORE_PARENT_ALPHA_TOOLTIP"] = "Ignore transparency/alpha value inherited from castbars parent's frame."
+L["IGNORE_PARENT_SCALE"] = "Ignore Parent Frame Scale"
+L["IGNORE_PARENT_SCALE_TOOLTIP"] = "Ignore scale multiplier inherited from castbars parent's frame."
 L["NO_NAMEPLATE_VISIBLE"] = "You have no target or target nameplate is not visible on screen."
 L["PER_CHARACTER"] = "|TInterface\\OptionsFrame\\UI-OptionsFrame-NewFeatureIcon:0:0:0:-1|tCharacter Specific Settings"
 L["PER_CHARACTER_TOOLTIP"] = "Click this to toggle between general settings and settings specific to this character."
@@ -57,6 +59,7 @@ L["POS_Y"] = "Position Y (Up/Down)"
 L["RESET_ALL"] = "Reset All Settings"
 L["SHOW_FOR_ENEMY"] = "Show Enemy Casts"
 L["SHOW_FOR_FRIENDLY"] = "Show Friendly Casts"
+L["SHOW_FOR_PETS"] = "Show Player Pet Casts"
 L["SHOW_SPARK"] = "Show Castbar Spark Effect"
 L["SHOW_TIMER"] = "Show Timer Text"
 L["SHOW_TIMER_TOOLTIP"] = "Display a timer countdown for the current cast."