From 20770db3aba953585495d21bfe0a2e430485b038 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Thu, 6 Apr 2017 23:03:50 +0200
Subject: First steps in cleaning-up menu. Selector, Button and Header extend
 Element now.

---
 button.lua | 56 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

(limited to 'button.lua')

diff --git a/button.lua b/button.lua
index c5681b2..7afc8e9 100644
--- a/button.lua
+++ b/button.lua
@@ -1,51 +1,48 @@
--- `Button`
--- Button used in `Menu`
-
+--- `Button`
+-- Menu element that can be activated by user.
 Button = {
-	text = "",
-	focused = false,
+	parent = --[[not.Menu]]nil,
 	x = 0,
 	y = 0,
+	text = "",
+	focused = false,
 	sprite,
 	quads,
 	delay = 2,
 	parent,
 }
 
-function Button:new(parent)
-	local o = {}
-	setmetatable(o, self)
-	self.__index = self
+-- `Button` is a child of `Element`.
+require "element"
+Button.__index = Button
+setmetatable(Button, Element)
+
+function Button:new (parent)
+	local o = setmetatable({}, self)
 	o.parent = parent
 	o.sprite, o.quads = parent:getSheet()
 	return o
 end
-function Button:setText(text)
+
+function Button:setText (text)
 	self.text = text or ""
 	return self
 end
-function Button:setPosition(x, y)
-	self.x = x or 0
-	self.y = y or 0
-	return self
-end
-function Button:getPosition() return self.x,self.y end
+
 function Button:focus(next)
 	self.focused = true
 	return true
 end
-function Button:blur()
+function Button:blur ()
 	self.focused = false
 end
-function Button:active() end
-function Button:isEnabled() return true end
-function Button:set(name, func)
-	if type(name) == "string" and type(func) == "function" then
-		self[name] = func
-	end
-	return self
+
+function Button:active () end
+function Button:isEnabled ()
+	return true
 end
-function Button:draw(scale)
+
+function Button:draw (scale)
 	local x,y = self:getPosition()
 	local quad = self.quads
 	local sprite = self.sprite
@@ -62,17 +59,18 @@ function Button:draw(scale)
 	love.graphics.setFont(Font)
 	love.graphics.printf(self.text, (x+2)*scale, (y+4)*scale, 54, "center", 0, scale, scale)
 end
-function Button:update(dt)
+
+function Button:update (dt)
 	self.delay = self.delay + dt
 	if self.delay > Button.delay then -- Button.delay is initial
 		self.delay = self.delay - Button.delay
 	end
 end
-function Button:controlpressed(set, action, key)
+
+function Button:controlpressed (set, action, key)
 	if action == "attack" and self.focused and self:isEnabled() then
 		self:active()
 	end
 end
-function Button:controlreleased(set, action, key) end
 
-return Button
\ No newline at end of file
+return Button
-- 
cgit v1.1


From d1a19fea50aefc9d7fb52568a5bdcfb56d75eccf Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Fri, 7 Apr 2017 03:24:40 +0200
Subject: Moved menu elements to /not/

---
 button.lua | 76 --------------------------------------------------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 button.lua

(limited to 'button.lua')

diff --git a/button.lua b/button.lua
deleted file mode 100644
index 7afc8e9..0000000
--- a/button.lua
+++ /dev/null
@@ -1,76 +0,0 @@
---- `Button`
--- Menu element that can be activated by user.
-Button = {
-	parent = --[[not.Menu]]nil,
-	x = 0,
-	y = 0,
-	text = "",
-	focused = false,
-	sprite,
-	quads,
-	delay = 2,
-	parent,
-}
-
--- `Button` is a child of `Element`.
-require "element"
-Button.__index = Button
-setmetatable(Button, Element)
-
-function Button:new (parent)
-	local o = setmetatable({}, self)
-	o.parent = parent
-	o.sprite, o.quads = parent:getSheet()
-	return o
-end
-
-function Button:setText (text)
-	self.text = text or ""
-	return self
-end
-
-function Button:focus(next)
-	self.focused = true
-	return true
-end
-function Button:blur ()
-	self.focused = false
-end
-
-function Button:active () end
-function Button:isEnabled ()
-	return true
-end
-
-function Button:draw (scale)
-	local x,y = self:getPosition()
-	local quad = self.quads
-	local sprite = self.sprite
-	if self:isEnabled() then
-		love.graphics.setColor(255, 255, 255, 255)
-	else
-		love.graphics.setColor(140, 140, 140, 255)
-	end
-	love.graphics.draw(sprite, quad.button.normal, x*scale, y*scale, 0, scale, scale)
-	if self.focused then
-		love.graphics.draw(sprite, quad.arrow_l, (x+54+math.floor(self.delay))*scale, (y+5)*scale, 0, scale, scale)
-		love.graphics.draw(sprite, quad.arrow_r, (x-2-math.floor(self.delay))*scale, (y+5)*scale, 0, scale, scale)
-	end
-	love.graphics.setFont(Font)
-	love.graphics.printf(self.text, (x+2)*scale, (y+4)*scale, 54, "center", 0, scale, scale)
-end
-
-function Button:update (dt)
-	self.delay = self.delay + dt
-	if self.delay > Button.delay then -- Button.delay is initial
-		self.delay = self.delay - Button.delay
-	end
-end
-
-function Button:controlpressed (set, action, key)
-	if action == "attack" and self.focused and self:isEnabled() then
-		self:active()
-	end
-end
-
-return Button
-- 
cgit v1.1