Merge branch 'tbcc' into vanilla

VuhDoGuiToolbox.lua

@@ -395,11 +395,47 @@ local VUHDO_FIX_EVENTS = {
 
 
 
-
+--
 local sEventsPerFrame = {};
+local sFrameHideParents = {};
+local sFrameOrigParents = {};
+
+
+
+--
+local function VUHDO_hideFrame(aFrame)
+
+	if not sFrameHideParents[aFrame:GetName()] then
+		local tFrameParent = CreateFrame("Frame");
+		tFrameParent:Hide();
+
+		sFrameHideParents[aFrame:GetName()] = tFrameParent;
+	end
+
+	if not sFrameOrigParents[aFrame:GetName()] then
+		sFrameOrigParents[aFrame:GetName()] = aFrame:GetParent();
+		aFrame:SetParent(sFrameHideParents[aFrame:GetName()]);
+	end
+
+end
+
 
 
+--
+local function VUHDO_showFrame(aFrame)
+
+	if sFrameOrigParents[aFrame:GetName()] then
+		aFrame:SetParent(sFrameOrigParents[aFrame:GetName()]);
+		aFrame:Show();
+
+		sFrameOrigParents[aFrame:GetName()] = nil;
+	end
+
+end
+
 
+
+--
 local function VUHDO_unregisterAndSaveEvents(anIsHide, ...)
 	local tFrame;
 	for tCnt = 1, select('#', ...) do
@@ -418,15 +454,16 @@ local function VUHDO_unregisterAndSaveEvents(anIsHide, ...)
 			end
 
 			tFrame:UnregisterAllEvents();
-			if anIsHide then tFrame:Hide(); end
+
+			if anIsHide then
+				VUHDO_hideFrame(tFrame);
+			end
 		end
 	end
 end
 
 
 
-
-
 --
 local function VUHDO_registerOriginalEvents(anIsShow, ...)
 	local tFrame;
@@ -446,7 +483,9 @@ local function VUHDO_registerOriginalEvents(anIsShow, ...)
 				tFrame:RegisterAllEvents();
 			end
 
-			if anIsShow then tFrame:Show(); end
+			if anIsShow then 
+				VUHDO_showFrame(tFrame);
+			end
 		end
 	end
 end
@@ -497,7 +536,7 @@ local function VUHDO_hideBlizzParty()
 		function()
 			if not InCombatLockdown() then
 				for tCnt = 1, 4 do
-					_G["PartyMemberFrame" .. tCnt]:Hide();
+					VUHDO_hideFrame(_G["PartyMemberFrame" .. tCnt]);
 				end
 			end
 		end
@@ -509,7 +548,7 @@ local function VUHDO_hideBlizzParty()
 		VUHDO_unregisterAndSaveEvents(false,
 			tPartyFrame, _G["PartyMemberFrame" .. tCnt .. "HealthBar"], _G["PartyMemberFrame" .. tCnt .. "ManaBar"]
 		);
-		tPartyFrame:Hide();
+		VUHDO_hideFrame(tPartyFrame);
 	end
 
 	if (CompactPartyFrame ~= nil and CompactPartyFrame:IsVisible()) then
@@ -530,7 +569,7 @@ local function VUHDO_showBlizzParty()
 			function()
 				if not InCombatLockdown() then
 					for tCnt = 1, 4 do
-						_G["PartyMemberFrame" .. tCnt]:Show();
+						VUHDO_showFrame(_G["PartyMemberFrame" .. tCnt]);
 					end
 				end
 			end
@@ -543,7 +582,7 @@ local function VUHDO_showBlizzParty()
 				tPartyFrame, _G["PartyMemberFrame" .. tCnt .. "HealthBar"], _G["PartyMemberFrame" .. tCnt .. "ManaBar"]);
 
 			if (UnitExists("party" .. tCnt)) then
-				tPartyFrame:Show();
+				VUHDO_showFrame(tPartyFrame);
 			end
 		end
 	else
@@ -564,10 +603,9 @@ end
 --
 local function VUHDO_showBlizzPlayer()
 	VUHDO_registerOriginalEvents(false, PlayerFrame, PlayerFrameHealthBar, PlayerFrameManaBar);
-	PlayerFrame:Show();
+	VUHDO_showFrame(PlayerFrame);
 	if "DEATHKNIGHT" == VUHDO_PLAYER_CLASS then
-		VUHDO_registerOriginalEvents(RuneFrame);
-		RuneFrame:Show();
+		VUHDO_registerOriginalEvents(true, RuneFrame);
 	end
 end
 
@@ -584,7 +622,8 @@ end
 
 --
 local function VUHDO_showBlizzTarget()
-	VUHDO_registerOriginalEvents(false, TargetFrame, TargetFrameHealthBar, TargetFrameManaBar, TargetFrameToT, FocusFrameToT);
+	VUHDO_registerOriginalEvents(true, TargetFrame, TargetFrameToT, FocusFrameToT);
+	VUHDO_registerOriginalEvents(false, TargetFrameHealthBar, TargetFrameManaBar);
 	ComboFrame:SetPoint("TOPRIGHT", "TargetFrame", "TOPRIGHT", -44, -9);
 end
 
@@ -612,7 +651,7 @@ end
 
 --
 local function VUHDO_showBlizzFocus()
-	VUHDO_registerOriginalEvents(false, FocusFrame);
+	VUHDO_registerOriginalEvents(true, FocusFrame);
 end
 
 

changelog.txt

@@ -60,6 +60,7 @@ Known issues:
   
   
 Bugfixes:  
+-- Fixed hiding of standard Blizzard UI frames (e.g. party, raid)  
   
   
 Improvements: