Mercurial > wow > hansgar_and_franzok_assist

changeset 28:7523376ecaa3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- framework update.
author Tercioo
date Fri, 18 Dec 2015 15:15:50 -0200
parents f9601754ab46
children 5da06cb420d4
files Hansgar_And_Franzok_Assist.lua Libs/DF/button.lua Libs/DF/fw.lua
diffstat 3 files changed, 20 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Hansgar_And_Franzok_Assist.lua	Fri Nov 20 10:36:43 2015 -0200
+++ b/Hansgar_And_Franzok_Assist.lua	Fri Dec 18 15:15:50 2015 -0200
@@ -19,7 +19,7 @@
 --local f = CreateFrame ("frame", "Hansgar_And_Franzok_Assist", UIParent)
 local f = DF:Create1PxPanel (_, 155, 166, "Hans & Franz", "Hansgar_And_Franzok_Assist", nil, "top", true)
 f:SetFrameStrata ("DIALOG")
-f.version = "v0.16"
+f.version = "v0.16a"
 
 f.Close:SetScript ("OnClick", function (self)
 	if (f.StampersPhase) then
--- a/Libs/DF/button.lua	Fri Nov 20 10:36:43 2015 -0200
+++ b/Libs/DF/button.lua	Fri Dec 18 15:15:50 2015 -0200
@@ -854,7 +854,10 @@
 		local x, y = GetCursorPosition()
 		x = _math_floor (x)
 		y = _math_floor (y)
-		if ((button.mouse_down+0.4 > GetTime() and (x == button.x and y == button.y)) or (x == button.x and y == button.y)) then
+		if (
+			(x == button.x and y == button.y) or
+			(button.mouse_down+0.5 > GetTime() and button:IsMouseOver())
+		) then
 			if (buttontype == "LeftButton") then
 				button.MyObject.func (button, buttontype, button.MyObject.param1, button.MyObject.param2)
 			else
@@ -936,7 +939,8 @@
 	end
 	
 	if (name:find ("$parent")) then
-		name = name:gsub ("$parent", parent:GetName())
+		local parentName = DF.GetParentName (parent)
+		name = name:gsub ("$parent", parentName)
 	end
 
 	local ButtonObject = {type = "button", dframework = true}
--- a/Libs/DF/fw.lua	Fri Nov 20 10:36:43 2015 -0200
+++ b/Libs/DF/fw.lua	Fri Dec 18 15:15:50 2015 -0200
@@ -1,5 +1,5 @@
 
-local dversion = 12
+local dversion = 13
 local major, minor = "DetailsFramework-1.0", dversion
 local DF, oldminor = LibStub:NewLibrary (major, minor)
 
@@ -205,6 +205,10 @@
 	return target
 end
 
+function DF:RemoveRealmName (name)
+	return name:gsub (("%-.*"), "")
+end
+
 function DF:RemoveRealName (name)
 	return name:gsub (("%-.*"), "")
 end
@@ -878,4 +882,11 @@
 	end
 	return template_table [template_name]
 end
-	
+
+function DF.GetParentName (frame)
+	local parentName = frame:GetName()
+	if (not parentName) then
+		error ("Details! FrameWork: called $parent but parent was no name.", 2)
+	end
+	return parentName
+end