Merge branch 'dev'

ls- · Dec 18, 2018 · bbba54a · bbba54a
2 parents f8b0dad + ccee82b
commit bbba54a
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 68 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## Version 80000.16
+
+- Added 8.1.0 support;
+- Added AdiButtonAuras support. Requires AdiButtonAuras alpha release; 
+- Fixed an issue where opening PvP panel was causing errors;
+- Updated embeds.
+
 ## Version 80000.15
 
 - Fixed an issue where xp bar was causing errors when there's no bars to show;

diff --git a/core/constants.lua b/core/constants.lua
@@ -78,61 +78,61 @@ local textures = {
 	},
 	inlineicons = {
 		-- first line
-		["LEADER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:1:33:1:33|t",
-		["DAMAGER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:34:66:1:33|t",
-		["HEALER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:67:99:1:33|t",
-		["TANK"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:100:132:1:33|t",
-		["RESTING"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:133:165:1:33|t",
-		["COMBAT"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:166:198:1:33|t",
-		["HORDE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:199:231:1:33|t",
+		["LEADER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:1:33:1:33|t",
+		["DAMAGER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:34:66:1:33|t",
+		["HEALER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:67:99:1:33|t",
+		["TANK"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:100:132:1:33|t",
+		["RESTING"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:133:165:1:33|t",
+		["COMBAT"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:166:198:1:33|t",
+		["HORDE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:199:231:1:33|t",
 		-- second line
-		["ALLIANCE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:1:33:34:66|t",
-		["FFA"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:34:66:34:66|t",
-		["PHASE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:67:99:34:66|t",
-		["PHASE_WM"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:100:132:34:66|t",
-		["QUEST"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:133:165:34:66|t",
-		["SHEEP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:166:198:34:66|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:199:231:34:66|t",
+		["ALLIANCE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:1:33:34:66|t",
+		["FFA"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:34:66:34:66|t",
+		["PHASE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:67:99:34:66|t",
+		["PHASE_WM"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:100:132:34:66|t",
+		["QUEST"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:133:165:34:66|t",
+		["SHEEP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:166:198:34:66|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:199:231:34:66|t",
 		-- third line
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:1:33:67:99|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:34:66:67:99|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:67:99:67:99|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:100:132:67:99|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:133:165:67:99|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:166:198:67:99|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:199:231:67:99|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:1:33:67:99|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:34:66:67:99|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:67:99:67:99|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:100:132:67:99|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:133:165:67:99|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:166:198:67:99|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:199:231:67:99|t",
 		-- fourth line
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:1:33:100:132|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:34:66:100:132|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:67:99:100:132|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:100:132:100:132|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:133:165:100:132|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:166:198:100:132|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:199:231:100:132|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:1:33:100:132|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:34:66:100:132|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:67:99:100:132|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:100:132:100:132|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:133:165:100:132|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:166:198:100:132|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:199:231:100:132|t",
 		-- fifth line
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:1:33:133:165|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:34:66:133:165|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:67:99:133:165|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:100:132:133:165|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:133:165:133:165|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:166:198:133:165|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:199:231:133:165|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:1:33:133:165|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:34:66:133:165|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:67:99:133:165|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:100:132:133:165|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:133:165:133:165|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:166:198:133:165|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:199:231:133:165|t",
 		-- sixth line
-		["WARRIOR"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:1:33:166:198|t",
-		["MAGE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:34:66:166:198|t",
-		["ROGUE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:67:99:166:198|t",
-		["DRUID"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:100:132:166:198|t",
-		["HUNTER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:133:165:166:198|t",
-		["SHAMAN"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:166:198:166:198|t",
-		["PRIEST"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:199:231:166:198|t",
+		["WARRIOR"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:1:33:166:198|t",
+		["MAGE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:34:66:166:198|t",
+		["ROGUE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:67:99:166:198|t",
+		["DRUID"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:100:132:166:198|t",
+		["HUNTER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:133:165:166:198|t",
+		["SHAMAN"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:166:198:166:198|t",
+		["PRIEST"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:199:231:166:198|t",
 		-- seventh line
-		["WARLOCK"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:1:33:199:231|t",
-		["PALADIN"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:34:66:199:231|t",
-		["DEATHKNIGHT"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:67:99:199:231|t",
-		["MONK"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:100:132:199:231|t",
-		["DEMONHUNTER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:133:165:199:231|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:166:198:199:231|t",
-		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%f:%f:0:0:256:256:199:231:199:231|t",
+		["WARLOCK"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:1:33:199:231|t",
+		["PALADIN"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:34:66:199:231|t",
+		["DEATHKNIGHT"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:67:99:199:231|t",
+		["MONK"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:100:132:199:231|t",
+		["DEMONHUNTER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:133:165:199:231|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:166:198:199:231|t",
+		-- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%.2f:%.2f:0:0:256:256:199:231:199:231|t",
 	},
 }
 

diff --git a/core/defaults.lua b/core/defaults.lua
@@ -213,7 +213,7 @@ D.profile = {
 					orientation = "VERTICAL",
 					color = {
 						class = false,
-						reaction = false,
+						reaction = true,
 					},
 					text = {
 						tag = "[ls:health:cur]",
@@ -406,7 +406,7 @@ D.profile = {
 					orientation = "VERTICAL",
 					color = {
 						class = false,
-						reaction = false,
+						reaction = true,
 					},
 					text = {
 						tag = "[ls:health:cur]",
@@ -545,7 +545,7 @@ D.profile = {
 					orientation = "HORIZONTAL",
 					color = {
 						class = false,
-						reaction = false,
+						reaction = true,
 					},
 					text = {
 						tag = "[ls:health:cur]",
@@ -794,7 +794,7 @@ D.profile = {
 					orientation = "HORIZONTAL",
 					color = {
 						class = false,
-						reaction = false,
+						reaction = true,
 					},
 					text = {
 						tag = "[ls:health:cur]",
@@ -961,7 +961,7 @@ D.profile = {
 				orientation = "HORIZONTAL",
 				color = {
 					class = false,
-					reaction = false,
+					reaction = true,
 				},
 				text = {
 					tag = "[ls:health:cur-perc]",
@@ -1212,7 +1212,7 @@ D.profile = {
 				orientation = "HORIZONTAL",
 				color = {
 					class = false,
-					reaction = false,
+					reaction = true,
 				},
 				text = {
 					tag = "",
@@ -1346,7 +1346,7 @@ D.profile = {
 				orientation = "HORIZONTAL",
 				color = {
 					class = false,
-					reaction = false,
+					reaction = true,
 				},
 				text = {
 					tag = "[ls:health:cur-perc]",
@@ -1597,7 +1597,7 @@ D.profile = {
 				orientation = "HORIZONTAL",
 				color = {
 					class = false,
-					reaction = false,
+					reaction = true,
 				},
 				text = {
 					tag = "",
@@ -1735,7 +1735,7 @@ D.profile = {
 				orientation = "HORIZONTAL",
 				color = {
 					class = false,
-					reaction = false,
+					reaction = true,
 				},
 				text = {
 					tag = "[ls:health:perc]",

diff --git a/init.lua b/init.lua
@@ -167,6 +167,10 @@ E:RegisterEvent("ADDON_LOADED", function(arg1)
 	addRefs()
 	cleanUpStep2()
 
+	if AdiButtonAuras and AdiButtonAuras.RegisterLAB then
+		AdiButtonAuras:RegisterLAB("LibActionButton-1.0-ls")
+	end
+
 	C.db:RegisterCallback("OnDatabaseShutdown", function()
 		C.db.char.version = E.VER.number
 		C.db.profile.version = E.VER.number

diff --git a/ls_UI.toc b/ls_UI.toc
@@ -1,11 +1,11 @@
-## Interface: 80000
+## Interface: 80100
 ## Author: lightspark
-## Version: 80000.15
+## Version: 80000.16
 ## Title: ls: |cff1a9fc0UI|r
 ## Notes: Yet another UI, but this one is a bit special...
 ## SavedVariablesPerCharacter: LS_UI_CHAR_CONFIG
 ## SavedVariables: LS_UI_GLOBAL_CONFIG
-## OptionalDeps: Masque
+## OptionalDeps: AdiButtonAuras, Masque
 
 embeds\_embeds.xml
 core\_core.xml

diff --git a/modules/bars/xpbar.lua b/modules/bars/xpbar.lua
@@ -568,7 +568,7 @@ function BARS.CreateXPBar()
 		hooksecurefunc("UIParentLoadAddOn", function(addOnName)
 			if addOnName == "Blizzard_PVPUI" then
 				if not isHonorBarHooked then
-					PVPQueueFrame.HonorInset.HonorLevelDisplay:SetScript("OnMouseUp", function()
+					PVPQueueFrame.HonorInset.CasualPanel.HonorLevelDisplay:SetScript("OnMouseUp", function()
 						if IsShiftKeyDown() then
 							if IsWatchingHonorAsXP() then
 								PlaySound(857) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_OFF
@@ -582,13 +582,13 @@ function BARS.CreateXPBar()
 						end
 					end)
 
-					PVPQueueFrame.HonorInset.HonorLevelDisplay:HookScript("OnEnter", function()
+					PVPQueueFrame.HonorInset.CasualPanel.HonorLevelDisplay:HookScript("OnEnter", function()
 						GameTooltip:AddLine(" ")
 						GameTooltip:AddLine(L["SHIFT_CLICK_TO_SHOW_AS_XP"])
 						GameTooltip:Show()
 					end)
 
-					PVPQueueFrame.HonorInset.HonorLevelDisplay:HookScript("OnLeave", function()
+					PVPQueueFrame.HonorInset.CasualPanel.HonorLevelDisplay:HookScript("OnLeave", function()
 						GameTooltip:Hide()
 					end)
 

diff --git a/modules/minimap/minimap.lua b/modules/minimap/minimap.lua
@@ -30,6 +30,7 @@ local unpack = _G.unpack
 
 -- Blizz
 local C_Calendar = _G.C_Calendar
+local C_DateAndTime = _G.C_DateAndTime
 local C_Garrison = _G.C_Garrison
 local C_Timer = _G.C_Timer
 local GetCursorPosition = _G.GetCursorPosition
@@ -699,7 +700,7 @@ function MODULE.Init()
 				self.elapsed = (self.elapsed or 0) + elapsed
 
 				if self.elapsed > 1 then
-					local date = C_Calendar.GetDate()
+					local date = C_DateAndTime.GetCurrentCalendarTime()
 
 					self:SetText(date.monthDay)
 

diff --git a/modules/tooltips/tooltips.lua b/modules/tooltips/tooltips.lua
@@ -685,13 +685,15 @@ local function tooltip_AddStatusBar(self, _, max, value)
 	end
 end
 
-local function tooltipBar_OnValueChanged(self, value)
-	if self:IsForbidden() or self:GetParent():IsForbidden() or not value then return end
+local function tooltipBar_Hook(self)
+	if self:IsForbidden() or self:GetParent():IsForbidden() then return end
 
 	local _, max = self:GetMinMaxValues()
 	if max == 1 then
 		self.Text:Hide()
 	else
+		local value = self:GetValue()
+
 		self.Text:Show()
 		self.Text:SetFormattedText("%s / %s", E:FormatNumber(value), E:FormatNumber(max))
 
@@ -796,7 +798,8 @@ function MODULE:Init()
 		GameTooltipStatusBar:ClearAllPoints()
 		GameTooltipStatusBar:SetPoint("TOPLEFT", GameTooltip, "BOTTOMLEFT", 8, -2)
 		GameTooltipStatusBar:SetPoint("TOPRIGHT", GameTooltip, "BOTTOMRIGHT", -8, -2)
-		GameTooltipStatusBar:SetScript("OnValueChanged", tooltipBar_OnValueChanged)
+		GameTooltipStatusBar:SetScript("OnShow", tooltipBar_Hook)
+		GameTooltipStatusBar:SetScript("OnValueChanged", tooltipBar_Hook)
 
 		hooksecurefunc("GameTooltip_AddStatusBar", tooltip_AddStatusBar)