From adc78875875a64d40b4cf65a8618fb49a77e8080 Mon Sep 17 00:00:00 2001
From: Matthias Richter <vrld@vrld.org>
Date: Wed, 9 May 2012 21:27:45 +0200
Subject: Mega update: Auto layout, code cleanup, api change.

Basically half a rewrite.
---
 button.lua | 44 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 10 deletions(-)

(limited to 'button.lua')

diff --git a/button.lua b/button.lua
index b55f35c..fd0cff4 100644
--- a/button.lua
+++ b/button.lua
@@ -23,31 +23,55 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ]]--
-local core = require((...):match("(.-)[^%.]+$") .. 'core')
+local BASE = (...):match("(.-)[^%.]+$")
+local core     = require(BASE .. 'core')
+local group    = require(BASE .. 'group')
+local mouse    = require(BASE .. 'mouse')
+local keyboard = require(BASE .. 'keyboard')
 
 -- the widget
-return function(title, x,y, w,h, widgetHit, draw)
+-- {text = text, pos = {x, y}, size={w, h}, widgetHit=widgetHit, draw=draw}
+return function(w)
+	assert(type(w) == "table" and w.text, "Invalid argument")
+
+	-- if tight fit requested, compute the size according to text size
+	-- have a 2px margin around the text
+	local tight = w.size and (w.size[1] == 'tight' or w.size[2] == 'tight')
+	if tight then
+		local f = assert(love.graphics.getFont())
+		if w.size[1] == 'tight' then
+			w.size[1] = f:getWidth(w.text) + 4
+		end
+		if w.size[2] == 'tight' then
+			w.size[2] = f:getHeight(w.text) + 4
+		end
+	end
+
 	-- Generate unique identifier for gui state update and querying.
 	local id = core.generateID()
 
+	-- group.getRect determines the position and size of the widget according
+	-- to the currently active group. Both arguments may be omitted.
+	local pos, size = group.getRect(w.pos, w.size)
+
+	-- mouse.updateWidget(id, {x,y}, {w,h}, widgetHit) updates the state for this widget.
+	-- widgetHit may be nil, in which case mouse.widgetHit will be used.
 	-- The widget mouse-state can be:
 	--   hot (mouse over widget),
 	--   active (mouse pressed on widget) or
 	--   normal (mouse not on widget and not pressed on widget).
-	--
-	-- core.mouse.updateState(id, widgetHit, x,y,w,h) updates the state for this widget.
-	core.mouse.updateState(id, widgetHit or core.style.widgetHit, x,y,w,h)
+	mouse.updateWidget(id, pos, size, w.widgetHit)
 
-	-- core.makeCyclable makes the item focus on tab or whatever binding is
+	-- keyboard.makeCyclable makes the item focus on tab or whatever binding is
 	-- in place (see core.keyboard.cycle). Cycle order is determied by the
 	-- order you call the widget functions.
-	core.makeCyclable(id)
+	keyboard.makeCyclable(id)
 
 	-- core.registerDraw(id, drawfunction, drawfunction-arguments...)
 	-- shows widget when core.draw() is called.
-	core.registerDraw(id, draw or core.style.Button, title,x,y,w,h)
+	core.registerDraw(id, w.draw or core.style.Button,
+		w.text, pos[1],pos[2], size[1],size[2])
 
-	return core.mouse.releasedOn(id) or
-	       (core.keyboard.key == 'return' and core.hasKeyFocus(id))
+	return mouse.releasedOn(id) or (keyboard.key == 'return' and keyboard.hasFocus(id))
 end
 
-- 
cgit v1.2.3-54-g00ecf