refactor: update UI layout positioning and fix pet class color override logic

This commit is contained in:
Bluewhale1337
2026-10-09 21:48:46 +02:00
parent 8050561733
commit 42ff023a54
9 changed files with 96 additions and 93 deletions
+6 -6
View File
@@ -8,7 +8,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="25" y="-30" />
<AbsDimension x="165" y="-30" />
</Offset>
</Anchor>
</Anchors>
@@ -36,7 +36,7 @@
</Layers>
<Anchors>
<Anchor point="TOPLEFT">
<Offset><AbsDimension x="30" y="-80" /></Offset>
<Offset><AbsDimension x="170" y="-80" /></Offset>
</Anchor>
</Anchors>
<Scripts>
@@ -60,7 +60,7 @@
</Layers>
<Anchors>
<Anchor point="TOPLEFT">
<Offset><AbsDimension x="30" y="-130" /></Offset>
<Offset><AbsDimension x="170" y="-130" /></Offset>
</Anchor>
</Anchors>
<Scripts>
@@ -84,7 +84,7 @@
</Layers>
<Anchors>
<Anchor point="TOPLEFT">
<Offset><AbsDimension x="30" y="-180" /></Offset>
<Offset><AbsDimension x="170" y="-180" /></Offset>
</Anchor>
</Anchors>
<Scripts>
@@ -108,7 +108,7 @@
</Layers>
<Anchors>
<Anchor point="TOPLEFT">
<Offset><AbsDimension x="30" y="-230" /></Offset>
<Offset><AbsDimension x="170" y="-230" /></Offset>
</Anchor>
</Anchors>
<Scripts>
@@ -132,7 +132,7 @@
</Layers>
<Anchors>
<Anchor point="TOPLEFT">
<Offset><AbsDimension x="30" y="-280" /></Offset>
<Offset><AbsDimension x="170" y="-280" /></Offset>
</Anchor>
</Anchors>
<Scripts>
+21 -21
View File
@@ -11,7 +11,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="21" y="-35"/>
<AbsDimension x="81" y="-35"/>
</Offset>
</Anchor>
<Anchor point="TOPRIGHT">
@@ -26,7 +26,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="15" y="10" />
<AbsDimension x="75" y="10" />
</Offset>
</Anchor>
</Anchors>
@@ -39,7 +39,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_BuffFrame" relativePoint="TOPLEFT">
<Offset>
<AbsDimension x="15" y="-15"/>
<AbsDimension x="75" y="-15"/>
</Offset>
</Anchor>
</Anchors>
@@ -53,7 +53,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_BuffWatch" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="20" y="0"/>
<AbsDimension x="80" y="0"/>
</Offset>
</Anchor>
</Anchors>
@@ -89,10 +89,10 @@
</Scripts>
</Frame>
<CheckButton name="HealBot_Options_Buff1Self" inherits="OptionsCheckButtonTemplate" id="1">
<Size><AbsDimension x="20" y="20"/></Size>
<Size><AbsDimension x="80" y="20"/></Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff1" relativePoint="TOPLEFT">
<Offset><AbsDimension x="40" y="18"/></Offset>
<Offset><AbsDimension x="100" y="18"/></Offset>
</Anchor>
</Anchors>
<Scripts>
@@ -126,10 +126,10 @@
</Scripts>
</Frame>
<CheckButton name="HealBot_Options_Buff2Self" inherits="OptionsCheckButtonTemplate" id="2">
<Size><AbsDimension x="20" y="20"/></Size>
<Size><AbsDimension x="80" y="20"/></Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff2" relativePoint="TOPLEFT">
<Offset><AbsDimension x="40" y="18"/></Offset>
<Offset><AbsDimension x="100" y="18"/></Offset>
</Anchor>
</Anchors>
<Scripts>
@@ -163,10 +163,10 @@
</Scripts>
</Frame>
<CheckButton name="HealBot_Options_Buff3Self" inherits="OptionsCheckButtonTemplate" id="3">
<Size><AbsDimension x="20" y="20"/></Size>
<Size><AbsDimension x="80" y="20"/></Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff3" relativePoint="TOPLEFT">
<Offset><AbsDimension x="40" y="18"/></Offset>
<Offset><AbsDimension x="100" y="18"/></Offset>
</Anchor>
</Anchors>
<Scripts>
@@ -200,10 +200,10 @@
</Scripts>
</Frame>
<CheckButton name="HealBot_Options_Buff4Self" inherits="OptionsCheckButtonTemplate" id="4">
<Size><AbsDimension x="20" y="20"/></Size>
<Size><AbsDimension x="80" y="20"/></Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff4" relativePoint="TOPLEFT">
<Offset><AbsDimension x="40" y="18"/></Offset>
<Offset><AbsDimension x="100" y="18"/></Offset>
</Anchor>
</Anchors>
<Scripts>
@@ -228,7 +228,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_BuffWatchInCombat" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="160" y="-30" />
<AbsDimension x="220" y="-30" />
</Offset>
</Anchor>
</Anchors>
@@ -237,10 +237,10 @@
</Scripts>
</Frame>
<CheckButton name="HealBot_Options_Buff5Self" inherits="OptionsCheckButtonTemplate" id="5">
<Size><AbsDimension x="20" y="20"/></Size>
<Size><AbsDimension x="80" y="20"/></Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff5" relativePoint="TOPLEFT">
<Offset><AbsDimension x="40" y="18"/></Offset>
<Offset><AbsDimension x="100" y="18"/></Offset>
</Anchor>
</Anchors>
<Scripts>
@@ -274,10 +274,10 @@
</Scripts>
</Frame>
<CheckButton name="HealBot_Options_Buff6Self" inherits="OptionsCheckButtonTemplate" id="6">
<Size><AbsDimension x="20" y="20"/></Size>
<Size><AbsDimension x="80" y="20"/></Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff6" relativePoint="TOPLEFT">
<Offset><AbsDimension x="40" y="18"/></Offset>
<Offset><AbsDimension x="100" y="18"/></Offset>
</Anchor>
</Anchors>
<Scripts>
@@ -311,10 +311,10 @@
</Scripts>
</Frame>
<CheckButton name="HealBot_Options_Buff7Self" inherits="OptionsCheckButtonTemplate" id="7">
<Size><AbsDimension x="20" y="20"/></Size>
<Size><AbsDimension x="80" y="20"/></Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff7" relativePoint="TOPLEFT">
<Offset><AbsDimension x="40" y="18"/></Offset>
<Offset><AbsDimension x="100" y="18"/></Offset>
</Anchor>
</Anchors>
<Scripts>
@@ -348,10 +348,10 @@
</Scripts>
</Frame>
<CheckButton name="HealBot_Options_Buff8Self" inherits="OptionsCheckButtonTemplate" id="8">
<Size><AbsDimension x="20" y="20"/></Size>
<Size><AbsDimension x="80" y="20"/></Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff8" relativePoint="TOPLEFT">
<Offset><AbsDimension x="40" y="18"/></Offset>
<Offset><AbsDimension x="100" y="18"/></Offset>
</Anchor>
</Anchors>
<Scripts>
+5 -5
View File
@@ -12,7 +12,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="25" y="-30" />
<AbsDimension x="100" y="-30" />
</Offset>
</Anchor>
</Anchors>
@@ -68,7 +68,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="25" y="-90" />
<AbsDimension x="100" y="-90" />
</Offset>
</Anchor>
</Anchors>
@@ -124,7 +124,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="25" y="-150" />
<AbsDimension x="100" y="-150" />
</Offset>
</Anchor>
</Anchors>
@@ -180,7 +180,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="25" y="-210" />
<AbsDimension x="100" y="-210" />
</Offset>
</Anchor>
</Anchors>
@@ -236,7 +236,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="25" y="-270" />
<AbsDimension x="100" y="-270" />
</Offset>
</Anchor>
</Anchors>
+9 -9
View File
@@ -10,7 +10,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="31" y="-40" />
<AbsDimension x="60" y="-40" />
</Offset>
</Anchor>
</Anchors>
@@ -49,7 +49,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_ActionLocked" relativePoint="TOPLEFT">
<Offset>
<AbsDimension x="200" y="0" />
<AbsDimension x="280" y="0" />
</Offset>
</Anchor>
</Anchors>
@@ -62,7 +62,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_GrowUpwards" relativePoint="TOPLEFT">
<Offset>
<AbsDimension x="200" y="0" />
<AbsDimension x="280" y="0" />
</Offset>
</Anchor>
</Anchors>
@@ -75,7 +75,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_ActionMouseover" relativePoint="TOPLEFT">
<Offset>
<AbsDimension x="200" y="0" />
<AbsDimension x="280" y="0" />
</Offset>
</Anchor>
</Anchors>
@@ -101,7 +101,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="21" y="-135"/>
<AbsDimension x="60" y="-135"/>
</Offset>
</Anchor>
<Anchor point="TOPRIGHT">
@@ -116,7 +116,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="130" y="-12" />
<AbsDimension x="280" y="-12" />
</Offset>
</Anchor>
</Anchors>
@@ -128,7 +128,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="10" y="-30" />
<AbsDimension x="60" y="-30" />
</Offset>
</Anchor>
</Anchors>
@@ -150,7 +150,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_ShowManaBars" relativePoint="TOPLEFT">
<Offset>
<AbsDimension x="180" y="0" />
<AbsDimension x="280" y="0" />
</Offset>
</Anchor>
</Anchors>
@@ -197,7 +197,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_GenFrame" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="10" y="-10" />
<AbsDimension x="60" y="-10" />
</Offset>
</Anchor>
</Anchors>
+4 -4
View File
@@ -8,7 +8,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="31" y="-40"/>
<AbsDimension x="160" y="-40"/>
</Offset>
</Anchor>
</Anchors>
@@ -46,7 +46,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="31" y="-145"/>
<AbsDimension x="160" y="-145"/>
</Offset>
</Anchor>
</Anchors>
@@ -106,7 +106,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="65" y="-95"/>
<AbsDimension x="194" y="-95"/>
</Offset>
</Anchor>
</Anchors>
@@ -117,7 +117,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_Integrations_ShowHoTTimers" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="34" y="-2"/>
<AbsDimension x="163" y="-2"/>
</Offset>
</Anchor>
</Anchors>
+35 -33
View File
@@ -92,39 +92,6 @@
<OnClick>HealBot_Options_NewSkinb_OnClick(this)</OnClick>
</Scripts>
</Button>
<Button name="HealBot_Options_TestBarsButton" inherits="UIPanelButtonTemplate" text="HEALBOT_OPTIONS_TESTBARS">
<Size>
<AbsDimension x="100" y="22"/>
</Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_NewSkinb" relativePoint="TOPRIGHT">
<Offset>
<AbsDimension x="10" y="0"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnClick>HealBot_Options_TestBarsButton_OnClick(this)</OnClick>
</Scripts>
</Button>
<Slider name="HealBot_Options_NumTestBarsS" inherits="HealBot_Options_SliderTemplate">
<Size>
<AbsDimension x="100" y="18" />
</Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_TestBarsButton" relativePoint="TOPRIGHT">
<Offset>
<AbsDimension x="15" y="0"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>HealBot_Options_val_OnLoad(this,HEALBOT_OPTIONS_TESTBARS,1,40)</OnLoad>
<OnValueChanged>HealBot_Options_NumTestBars_OnValueChanged(this)</OnValueChanged>
</Scripts>
</Slider>
<Frame name="HealBot_Options_Scale">
<Size>
@@ -612,6 +579,41 @@
<BarColor r="0" g="1" b="0"/>
</StatusBar>
<Button name="HealBot_Options_TestBarsButton" inherits="UIPanelButtonTemplate" text="HEALBOT_OPTIONS_TESTBARS">
<Size>
<AbsDimension x="100" y="22"/>
</Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_BorderColorpick" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="-61" y="-20"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnClick>HealBot_Options_TestBarsButton_OnClick(this)</OnClick>
</Scripts>
</Button>
<Slider name="HealBot_Options_NumTestBarsS" inherits="HealBot_Options_SliderTemplate">
<Size>
<AbsDimension x="100" y="18" />
</Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_TestBarsButton" relativePoint="TOPRIGHT">
<Offset>
<AbsDimension x="15" y="-2"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>HealBot_Options_val_OnLoad(this,HEALBOT_OPTIONS_TESTBARS,1,40)</OnLoad>
<OnValueChanged>HealBot_Options_NumTestBars_OnValueChanged(this)</OnValueChanged>
</Scripts>
</Slider>
</Frames>
</Frame>
+12 -12
View File
@@ -11,7 +11,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="21" y="-30"/>
<AbsDimension x="76" y="-30"/>
</Offset>
</Anchor>
<Anchor point="TOPRIGHT">
@@ -63,7 +63,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_Dummy" relativePoint="TOPLEFT">
<Offset>
<AbsDimension x="40" y="-30"/>
<AbsDimension x="95" y="-30"/>
</Offset>
</Anchor>
</Anchors>
@@ -79,7 +79,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_ComboButtons_Button1" relativePoint="TOPRIGHT">
<Offset>
<AbsDimension x="40" y="0"/>
<AbsDimension x="95" y="0"/>
</Offset>
</Anchor>
</Anchors>
@@ -92,7 +92,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_ComboButtons_Button2" relativePoint="TOPRIGHT">
<Offset>
<AbsDimension x="50" y="0"/>
<AbsDimension x="105" y="0"/>
</Offset>
</Anchor>
</Anchors>
@@ -118,7 +118,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_ComboButtons_Button4" relativePoint="TOPRIGHT">
<Offset>
<AbsDimension x="55" y="0"/>
<AbsDimension x="110" y="0"/>
</Offset>
</Anchor>
</Anchors>
@@ -200,7 +200,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_ShiftCtrl" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="25" y="-4" />
<AbsDimension x="80" y="-4" />
</Offset>
</Anchor>
</Anchors>
@@ -219,7 +219,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="20" y="-300"/>
<AbsDimension x="75" y="-300"/>
</Offset>
</Anchor>
<Anchor point="TOPRIGHT">
@@ -233,7 +233,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_TooltipsPanel" relativePoint="TOPLEFT">
<Offset>
<AbsDimension x="20" y="-4" />
<AbsDimension x="75" y="-4" />
</Offset>
</Anchor>
</Anchors>
@@ -246,7 +246,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_ShowTooltip" relativePoint="TOPRIGHT">
<Offset>
<AbsDimension x="68" y="-2" />
<AbsDimension x="123" y="-2" />
</Offset>
</Anchor>
</Anchors>
@@ -258,7 +258,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_TooltipsPanel" relativePoint="TOPLEFT">
<Offset>
<AbsDimension x="20" y="-30" />
<AbsDimension x="75" y="-30" />
</Offset>
</Anchor>
</Anchors>
@@ -271,7 +271,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_TooltipsPanel" relativePoint="TOPLEFT">
<Offset>
<AbsDimension x="20" y="-55" />
<AbsDimension x="75" y="-55" />
</Offset>
</Anchor>
</Anchors>
@@ -284,7 +284,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="HealBot_Options_TooltipsPanel" relativePoint="TOPLEFT">
<Offset>
<AbsDimension x="20" y="-80" />
<AbsDimension x="75" y="-80" />
</Offset>
</Anchor>
</Anchors>
+3 -3
View File
@@ -69,13 +69,13 @@ function HealBot_HealthColor(unit, hlth, maxhlth)
end
local colorMode = HealBot_Config.bcolormode[HealBot_Config.Current_Skin] or 1
if colorMode == 2 and HealBot_Model and HealBot_Model.units[unit] and HealBot_Model.units[unit].englishClass and RAID_CLASS_COLORS and RAID_CLASS_COLORS[HealBot_Model.units[unit].englishClass] then
if colorMode == 2 and string.find(unit, "pet") then
r, g, b = 0.4, 0.9, 0.6 -- Mint color
elseif colorMode == 2 and HealBot_Model and HealBot_Model.units[unit] and HealBot_Model.units[unit].englishClass and RAID_CLASS_COLORS and RAID_CLASS_COLORS[HealBot_Model.units[unit].englishClass] then
local engClass = HealBot_Model.units[unit].englishClass
r = RAID_CLASS_COLORS[engClass].r
g = RAID_CLASS_COLORS[engClass].g
b = RAID_CLASS_COLORS[engClass].b
elseif colorMode == 2 and string.find(unit, "pet") then
r, g, b = 0.4, 0.9, 0.6 -- Mint color
else
if pct >= 0.98 then r = 0.0; end
if pct < 0.98 and pct >= 0.65 then r = 2.94 - (pct * 3); end
+1
View File
@@ -114,6 +114,7 @@ Default installation path: `C:\Program Files\World of Warcraft\Interface\AddOns\
* **UI Update - Customizable icon size** - Added an option to change size of HoT icons (default to 12px).
* **Cleanup** - Removed dead code `HealBot_Groups` table.
* **Bug Fix - Buff Watch Self** - Fixed an issue where the "Self Only" toggle for watched buffs failed to load visually across sessions.
* **Bug Fix - Pet Coloring** - Fixed an issue where custom server integrations giving pets a class could override the mint pet color when class color override is toggled.
**v1.6.2**
* **Hotfix - raid and party frames** - if getNumRaidMembers() > 0 wrapper around extra bars stopped from displaying all frames blocked from displaying Extras\Raid.