Quantcast

fixed tinyDPS docklet

failcoder [08-14-15 - 01:49]
fixed tinyDPS docklet
Filename
SVUI_!Core/system/dock.lua
SVUI_Skins/components/docklet.lua
diff --git a/SVUI_!Core/system/dock.lua b/SVUI_!Core/system/dock.lua
index fff2c1e..31891da 100644
--- a/SVUI_!Core/system/dock.lua
+++ b/SVUI_!Core/system/dock.lua
@@ -1487,16 +1487,33 @@ DOCKS
 MOD.TopCenter = _G["SVUI_DockTopCenter"];
 MOD.BottomCenter = _G["SVUI_DockBottomCenter"];

+local DockAlert_OnEvent = function(self, event)
+    if(event == 'PLAYER_REGEN_ENABLED') then
+        self:SetHeight(self.activeHeight)
+        self:UnregisterEvent(event)
+    end
+end
+
 local DockAlert_Activate = function(self, child, newHeight)
 	local fallbackHeight = SV.db.Dock.buttonSize or 22;
 	local size = newHeight or fallbackHeight;
-	self:SetHeight(size)
 	child:ClearAllPoints()
 	child:SetAllPoints(self)
+	self.activeHeight = size;
+	if(InCombatLockdown()) then
+		self:RegisterEvent('PLAYER_REGEN_ENABLED')
+	else
+		self:SetHeight(size)
+	end
 end

 local DockAlert_Deactivate = function(self)
-	self:SetHeight(1)
+	self.activeHeight = 1;
+	if(InCombatLockdown()) then
+		self:RegisterEvent('PLAYER_REGEN_ENABLED')
+	else
+		self:SetHeight(1)
+	end
 end

 local DockProxy_ResetAll = function(self, ...)
@@ -1535,6 +1552,7 @@ for location, settings in pairs(DOCK_LOCATIONS) do

 	MOD[location].Alert.Activate 	= DockAlert_Activate;
 	MOD[location].Alert.Deactivate 	= DockAlert_Deactivate;
+	MOD[location].Alert:SetScript("OnEvent", DockAlert_OnEvent);

 	MOD[location].Bar.Parent 		= MOD[location];
 	MOD[location].Bar.SetDefault 	= DockBar_SetDefault;
diff --git a/SVUI_Skins/components/docklet.lua b/SVUI_Skins/components/docklet.lua
index e6f0ef6..c4738ca 100644
--- a/SVUI_Skins/components/docklet.lua
+++ b/SVUI_Skins/components/docklet.lua
@@ -292,6 +292,7 @@ DOCK_EMBEDS["TinyDPS"] = function(self)
 	tdps.hidePvP = false;
 	tdpsFrame:ClearAllPoints()
 	tdpsFrame:SetAllPoints(self)
+	tdpsFrame:SetParent(self)
 	tdpsRefresh()

 	self.Framelink = tdpsFrame