hero class fixes from Mattibalize

RatingBuster/libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua

@@ -1,54 +1,48 @@
---[[-----------------------------------------------------------------------------
-Button Widget
-Graphical Button.
--------------------------------------------------------------------------------]]
-local Type, Version = "Button", 20
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
+local AceGUI = LibStub("AceGUI-3.0")
 
 -- WoW APIs
 local _G = _G
-local PlaySound, CreateFrame, UIParent = PlaySound, CreateFrame, UIParent
+local PlaySound = PlaySound
+local CreateFrame, UIParent = CreateFrame, UIParent
 
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Button_OnClick(frame, ...)
-	PlaySound("igMainMenuOption")
-	frame.obj:Fire("OnClick", ...)
-	AceGUI:ClearFocus()
-end
-
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
+--------------------------
+-- Button		        --
+--------------------------
+do
+	local Type = "Button"
+	local Version = 13
+	
+	local function OnAcquire(self)
 		-- restore default values
 		self:SetHeight(24)
 		self:SetWidth(200)
+	end
+	
+	local function OnRelease(self)
+		self.frame:ClearAllPoints()
+		self.frame:Hide()
 		self:SetDisabled(false)
-		self:SetText()
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetText"] = function(self, text)
-		self.text:SetText(text)
-	end,
-
-	["SetDisabled"] = function(self, disabled)
+	end
+	
+	local function Button_OnClick(this, ...)
+		PlaySound("igMainMenuOption")
+		this.obj:Fire("OnClick", ...)
+		AceGUI:ClearFocus()
+	end
+	
+	local function Button_OnEnter(this)
+		this.obj:Fire("OnEnter")
+	end
+	
+	local function Button_OnLeave(this)
+		this.obj:Fire("OnLeave")
+	end
+	
+	local function SetText(self, text)
+		self.text:SetText(text or "")
+	end
+	
+	local function SetDisabled(self, disabled)
 		self.disabled = disabled
 		if disabled then
 			self.frame:Disable()
@@ -56,37 +50,57 @@ local methods = {
 			self.frame:Enable()
 		end
 	end
-}
+	
+	local function Constructor()
+		local num  = AceGUI:GetNextWidgetNum(Type)
+		local name = "AceGUI30Button"..num
+		local frame = CreateFrame("Button",name,UIParent,"UIPanelButtonTemplate2")
+		local self = {}
+		self.num = num
+		self.type = Type
+		self.frame = frame
+		
+		local left = _G[name .. "Left"]
+		local right = _G[name .. "Right"]
+		local middle = _G[name .. "Middle"]
+		
+		left:SetPoint("TOP", frame, "TOP", 0, 0)
+		left:SetPoint("BOTTOM", frame, "BOTTOM", 0, 0)
+		
+		right:SetPoint("TOP", frame, "TOP", 0, 0)
+		right:SetPoint("BOTTOM", frame, "BOTTOM", 0, 0)
+		
+		middle:SetPoint("TOP", frame, "TOP", 0, 0)
+		middle:SetPoint("BOTTOM", frame, "BOTTOM", 0, 0)
 
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type)
-	local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate2")
-	frame:Hide()
+		local text = frame:GetFontString()
+		self.text = text
+		text:ClearAllPoints()
+		text:SetPoint("TOPLEFT",frame,"TOPLEFT", 15, -1)
+		text:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT", -15, 1)
+		text:SetJustifyV("MIDDLE")
 
-	frame:EnableMouse(true)
-	frame:SetScript("OnClick", Button_OnClick)
-	frame:SetScript("OnEnter", Control_OnEnter)
-	frame:SetScript("OnLeave", Control_OnLeave)
+		frame:SetScript("OnClick",Button_OnClick)
+		frame:SetScript("OnEnter",Button_OnEnter)
+		frame:SetScript("OnLeave",Button_OnLeave)
 
-	local text = frame:GetFontString()
-	text:ClearAllPoints()
-	text:SetPoint("TOPLEFT", 15, -1)
-	text:SetPoint("BOTTOMRIGHT", -15, 1)
-	text:SetJustifyV("MIDDLE")
+		self.SetText = SetText
+		self.SetDisabled = SetDisabled
+		
+		frame:EnableMouse(true)
 
-	local widget = {
-		text  = text,
-		frame = frame,
-		type  = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
+		frame:SetHeight(24)
+		frame:SetWidth(200)
+	
+		self.OnRelease = OnRelease
+		self.OnAcquire = OnAcquire
+		
+		self.frame = frame
+		frame.obj = self
+
+		AceGUI:RegisterAsWidget(self)
+		return self
 	end
-
-	return AceGUI:RegisterAsWidget(widget)
+	
+	AceGUI:RegisterWidgetType(Type,Constructor,Version)
 end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)