From 370c10c78770bc3c1a70a086b238e7a8e5197fb9 Mon Sep 17 00:00:00 2001
From: Matthias Richter <vrld@vrld.org>
Date: Wed, 22 Feb 2012 23:33:54 +0100
Subject: Rename makeTabable() to makeCyclable()

---
 button.lua   | 7 ++++---
 checkbox.lua | 2 +-
 core.lua     | 4 ++--
 input.lua    | 2 +-
 slider.lua   | 2 +-
 slider2d.lua | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/button.lua b/button.lua
index 94ff634..b601458 100644
--- a/button.lua
+++ b/button.lua
@@ -13,9 +13,10 @@ return function(title, x,y, w,h, draw)
 	-- core.mouse.updateState(id, x,y,w,h) updates the state for this widget.
 	core.mouse.updateState(id, x,y,w,h)
 
-	-- core.makeTabable makes the item focus on tab. Tab order is determied
-	-- by the order you call the widget functions.
-	core.makeTabable(id)
+	-- core.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)
 
 	-- core.registerDraw(id, drawfunction, drawfunction-arguments...)
 	-- shows widget when core.draw() is called.
diff --git a/checkbox.lua b/checkbox.lua
index 306fc8f..b51cbb3 100644
--- a/checkbox.lua
+++ b/checkbox.lua
@@ -4,7 +4,7 @@ return function(info, x,y, w,h, draw)
 	local id = core.generateID()
 
 	core.mouse.updateState(id, x,y,w,h)
-	core.makeTabable(id)
+	core.makeCyclable(id)
 	core.registerDraw(id, draw or core.style.Checkbox, info.checked,x,y,w,h)
 
 	local checked = info.checked
diff --git a/core.lua b/core.lua
index a93ed1d..bb5295a 100644
--- a/core.lua
+++ b/core.lua
@@ -59,7 +59,7 @@ function keyboard.isBindingDown(bind)
 	return keyboard.key == bind.key and modifiersDown
 end
 
-local function makeTabable(id)
+local function makeCyclable(id)
 	keyboard.tryGrab(id)
 	if hasKeyFocus(id) then
 		if keyboard.isBindingDown(keyboard.cycle.prev) then
@@ -146,7 +146,7 @@ return {
 	isHot        = isHot,
 	isActive     = isActive,
 	hasKeyFocus  = hasKeyFocus,
-	makeTabable  = makeTabable,
+	makeCyclable = makeCyclable,
 
 	style        = require((...):match("(.-)[^%.]+$") .. '.style-default'),
 	color        = color,
diff --git a/input.lua b/input.lua
index 7fe399d..d514348 100644
--- a/input.lua
+++ b/input.lua
@@ -6,7 +6,7 @@ return function(info, x,y,w,h, draw)
 
 	local id = core.generateID()
 	core.mouse.updateState(id, x,y,w,h)
-	core.makeTabable(id)
+	core.makeCyclable(id)
 	if core.isActive(id) then core.setKeyFocus(id) end
 
 	core.registerDraw(id, draw or core.style.Input, info.text, info.cursor, x,y,w,h)
diff --git a/slider.lua b/slider.lua
index feed65c..7e4a6d9 100644
--- a/slider.lua
+++ b/slider.lua
@@ -9,7 +9,7 @@ return function(info, x,y,w,h, draw)
 
 	local id = core.generateID()
 	core.mouse.updateState(id, x,y,w,h)
-	core.makeTabable(id)
+	core.makeCyclable(id)
 	core.registerDraw(id,draw or core.style.Slider, fraction, x,y,w,h, info.vertical)
 
 	-- mouse update
diff --git a/slider2d.lua b/slider2d.lua
index f20a05b..8614113 100644
--- a/slider2d.lua
+++ b/slider2d.lua
@@ -12,7 +12,7 @@ return function(info, x,y,w,h, draw)
 
 	local id = core.generateID()
 	core.mouse.updateState(id, x,y,w,h)
-	core.makeTabable(id)
+	core.makeCyclable(id)
 	core.registerDraw(id,draw or core.style.Slider2D, fraction, x,y,w,h)
 
 	-- update value
-- 
cgit v1.2.3-54-g00ecf