Mercurial > wow > hansgar_and_franzok_assist

diff Libs/DF/button.lua @ 29:5da06cb420d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- framework update.
author Tercioo
date Sat, 02 Jan 2016 13:33:05 -0200
parents 7523376ecaa3
children 7944c081e5b4
line wrap: on
line diff
--- a/Libs/DF/button.lua	Fri Dec 18 15:15:50 2015 -0200
+++ b/Libs/DF/button.lua	Sat Jan 02 13:33:05 2016 -0200
@@ -385,14 +385,14 @@
 	end
 
 -- icon
-	function ButtonMetaFunctions:SetIcon (texture, width, height, layout, texcoord, overlay, textdistance, leftpadding)
+	function ButtonMetaFunctions:SetIcon (texture, width, height, layout, texcoord, overlay, textdistance, leftpadding, textheight)
 		if (not self.icon) then
 			self.icon = self:CreateTexture (nil, "artwork")
 			self.icon:SetSize (self.height*0.8, self.height*0.8)
 			self.icon:SetPoint ("left", self.widget, "left", 4 + (leftpadding or 0), 0)
 			self.icon.leftpadding = leftpadding or 0
 			self.widget.text:ClearAllPoints()
-			self.widget.text:SetPoint ("left", self.icon, "right", textdistance or 2, 0)
+			self.widget.text:SetPoint ("left", self.icon, "right", textdistance or 2, 0 + (textheight or 0))
 		end
 		
 		self.icon:SetTexture (texture)
@@ -932,7 +932,7 @@
 		DF.ButtonCounter = DF.ButtonCounter + 1
 		
 	elseif (not parent) then
-		return nil
+		return error ("Details! FrameWork: parent not found.", 2)
 	end
 	if (not container) then
 		container = parent