Mercurial > wow > hansgar_and_franzok_assist

diff Libs/DF/cooltip.lua @ 26:e16b1fc13935

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- framework update.
author Tercio
date Fri, 16 Oct 2015 14:46:27 -0300
parents dc1c77254f80
children 5da06cb420d4
line wrap: on
line diff
--- a/Libs/DF/cooltip.lua	Thu Oct 08 11:52:43 2015 -0300
+++ b/Libs/DF/cooltip.lua	Fri Oct 16 14:46:27 2015 -0300
@@ -188,8 +188,8 @@
 	
 		CoolTip.frame1 = frame1
 		CoolTip.frame2 = frame2
-		DF:Fade (frame1, 0)
-		DF:Fade (frame2, 0)
+		DF:FadeFrame (frame1, 0)
+		DF:FadeFrame (frame2, 0)
 
 		--> button containers
 		frame1.Lines = {}
@@ -261,10 +261,10 @@
 				CoolTip.mouseOver = true
 				CoolTip.had_interaction = true
 				self:SetScript ("OnUpdate", nil)
-				DF:Fade (self, 0)
+				DF:FadeFrame (self, 0)
 				--rever
 				if (CoolTip.sub_menus) then
-					DF:Fade (frame2, 0)
+					DF:FadeFrame (frame2, 0)
 				end
 			end
 		end)
@@ -278,8 +278,8 @@
 				CoolTip.mouseOver = true
 				CoolTip.had_interaction = true
 				self:SetScript ("OnUpdate", nil)
-				DF:Fade (self, 0)
-				DF:Fade (frame1, 0)
+				DF:FadeFrame (self, 0)
+				DF:FadeFrame (frame1, 0)
 			end
 		end)
 
@@ -287,11 +287,11 @@
 					elapsedTime = elapsedTime+elapsed
 					if (elapsedTime > 0.7) then
 						if (not CoolTip.active and not CoolTip.buttonClicked and self == CoolTip.Host) then
-							DF:Fade (self, 1)
-							DF:Fade (frame2, 1)
+							DF:FadeFrame (self, 1)
+							DF:FadeFrame (frame2, 1)
 						elseif (not CoolTip.active) then
-							DF:Fade (self, 1)
-							DF:Fade (frame2, 1)
+							DF:FadeFrame (self, 1)
+							DF:FadeFrame (frame2, 1)
 						end
 						self:SetScript ("OnUpdate", nil)
 						frame2:SetScript ("OnUpdate", nil)
@@ -317,11 +317,11 @@
 					elapsedTime = elapsedTime+elapsed
 					if (elapsedTime > 0.7) then
 						if (not CoolTip.active and not CoolTip.buttonClicked and self == CoolTip.Host) then
-							DF:Fade (self, 1)
-							DF:Fade (frame2, 1)
+							DF:FadeFrame (self, 1)
+							DF:FadeFrame (frame2, 1)
 						elseif (not CoolTip.active) then
-							DF:Fade (self, 1)
-							DF:Fade (frame2, 1)
+							DF:FadeFrame (self, 1)
+							DF:FadeFrame (frame2, 1)
 						end
 						self:SetScript ("OnUpdate", nil)
 						frame1:SetScript ("OnUpdate", nil)
@@ -386,12 +386,12 @@
 								elapsedTime = elapsedTime+elapsed
 								if (elapsedTime > 0.7) then
 									if (not CoolTip.active and not CoolTip.buttonClicked) then
-										DF:Fade (frame1, 1)
-										DF:Fade (frame2, 1)
+										DF:FadeFrame (frame1, 1)
+										DF:FadeFrame (frame2, 1)
 							
 									elseif (not CoolTip.active) then
-										DF:Fade (frame1, 1)
-										DF:Fade (frame2, 1)
+										DF:FadeFrame (frame1, 1)
+										DF:FadeFrame (frame2, 1)
 									end
 									frame1:SetScript ("OnUpdate", nil)
 								end
@@ -441,7 +441,7 @@
 
 								else
 									--hide second frame
-									DF:Fade (frame2, 1)
+									DF:FadeFrame (frame2, 1)
 									CoolTip.last_button = nil
 								end
 							else
@@ -491,11 +491,11 @@
 								elapsedTime = elapsedTime+elapsed
 								if (elapsedTime > 0.7) then
 									if (not CoolTip.active and not CoolTip.buttonClicked) then
-										DF:Fade (frame1, 1)
-										DF:Fade (frame2, 1)
+										DF:FadeFrame (frame1, 1)
+										DF:FadeFrame (frame2, 1)
 									elseif (not CoolTip.active) then
-										DF:Fade (frame1, 1)
-										DF:Fade (frame2, 1)
+										DF:FadeFrame (frame1, 1)
+										DF:FadeFrame (frame2, 1)
 									end
 									frame2:SetScript ("OnUpdate", nil)
 								end
@@ -524,8 +524,8 @@
 								frame1:SetScript ("OnUpdate", nil)
 								frame2:SetScript ("OnUpdate", nil)
 								
-								DF:Fade (frame1, 0)
-								DF:Fade (frame2, 0)
+								DF:FadeFrame (frame1, 0)
+								DF:FadeFrame (frame2, 0)
 							else
 								CoolTip.mouseOver = true
 								CoolTip.had_interaction = true
@@ -999,7 +999,7 @@
 			menuButton:SetPoint ("left", frame2, "left")
 			menuButton:SetPoint ("right", frame2, "right")
 			
-			DF:Fade (menuButton, 0)
+			DF:FadeFrame (menuButton, 0)
 			
 			--> string length
 			local stringWidth = menuButton.leftText:GetStringWidth() + menuButton.rightText:GetStringWidth() + menuButton.leftIcon:GetWidth() + menuButton.rightIcon:GetWidth()
@@ -1048,7 +1048,7 @@
 	function CoolTip:ShowSub (index)
 	
 		if (CoolTip.OptionsTable.IgnoreSubMenu) then
-			DF:Fade (frame2, 1)
+			DF:FadeFrame (frame2, 1)
 			return
 		end
 	
@@ -1114,7 +1114,7 @@
 		end
 		
 		for i = CoolTip.IndexesSub [index] + 1, #frame2.Lines do 
-			DF:Fade (frame2.Lines[i], 1)
+			DF:FadeFrame (frame2.Lines[i], 1)
 		end
 
 		local spacing = 0
@@ -1217,7 +1217,7 @@
 			frame2:SetWidth (frame2.w + 44)
 		end
 		
-		DF:Fade (frame2, 0)
+		DF:FadeFrame (frame2, 0)
 		
 		CoolTip:CheckOverlap()
 		
@@ -1246,7 +1246,7 @@
 	end
 	
 	function CoolTip:HideSub()
-		DF:Fade (frame2, 1)
+		DF:FadeFrame (frame2, 1)
 	end	
 	
 
@@ -1255,11 +1255,11 @@
 		row.leftText:SetHeight (10)
 	end
 
-	--> ~inicio ~start
+	--> ~inicio ~start ~tooltip
 	function CoolTip:monta_tooltip()
 		
 		--> hide sub frame
-		DF:Fade (frame2, 1)
+		DF:FadeFrame (frame2, 1)
 		--> hide select bar
 		CoolTip:HideSelectedTexture (frame1)
 
@@ -1393,7 +1393,7 @@
 		end
 		
 		--> unhide frame
-		DF:Fade (frame1, 0)
+		DF:FadeFrame (frame1, 0)
 		CoolTip:SetMyPoint (host)
 		
 		--> fix sparks
@@ -1417,7 +1417,7 @@
 		button.divbar:SetDesaturated (true)
 	end
 	
-	--> ~inicio ~start
+	--> ~inicio ~start ~menu
 	function CoolTip:monta_cooltip (host, instancia, options, sub_menus, icones, tamanho1, tamanho2, font, fontsize)
 
 		if (CoolTip.Indexes == 0) then
@@ -1442,12 +1442,12 @@
 			frame2.w = 0
 			frame2:SetHeight (6)
 			if (CoolTip.SelectedIndexMain and CoolTip.IndexesSub [CoolTip.SelectedIndexMain] and CoolTip.IndexesSub [CoolTip.SelectedIndexMain] > 0) then
-				DF:Fade (frame2, 0)
+				DF:FadeFrame (frame2, 0)
 			else
-				DF:Fade (frame2, 1)
+				DF:FadeFrame (frame2, 1)
 			end
 		else
-			DF:Fade (frame2, 1)
+			DF:FadeFrame (frame2, 1)
 		end
 		
 		CoolTip.active = true
@@ -1600,7 +1600,7 @@
 			frame1.frameWallpaper:Hide()
 		end
 	
-		DF:Fade (frame1, 0)
+		DF:FadeFrame (frame1, 0)
 
 		for i = 1, CoolTip.Indexes do
 			if (CoolTip.SelectedIndexMain and CoolTip.SelectedIndexMain == i) then
@@ -2858,8 +2858,8 @@
 	function CoolTip:Close()
 		CoolTip.active = false
 		CoolTip.Host = nil
-		DF:Fade (frame1, 1)
-		DF:Fade (frame2, 1)
+		DF:FadeFrame (frame1, 1)
+		DF:FadeFrame (frame2, 1)
 		
 	end