From 5c9146f74c1cd522c22a9affa403cf1f4b96921d Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Wed, 24 Aug 2016 07:10:02 +0200
Subject: Now it's fine

---
 config/menuselect.lua |  5 +++--
 selector.lua          | 32 ++++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/config/menuselect.lua b/config/menuselect.lua
index c070f4c..ffdda7f 100644
--- a/config/menuselect.lua
+++ b/config/menuselect.lua
@@ -7,8 +7,9 @@ local width, height = love.graphics.getWidth()/getRealScale(), love.graphics.get
 
 return {
 	selector:new(menu)
-		:setPosition(10,10)
-		:setSpacing(42, 0)
+		:setPosition(width/2,10)
+		:setMargin(8)
+		:setSize(32, 32)
 		:set("list", require "nautslist")
 		:set("global", false)
 		:set("sprite", love.graphics.newImage("assets/portraits.png"))
diff --git a/selector.lua b/selector.lua
index f7f3474..240716e 100644
--- a/selector.lua
+++ b/selector.lua
@@ -4,7 +4,8 @@
 How to use `Selector` in `Menu` config file?
 selector:new(menu)
 	:setPosition(x, y)
-	:setSpacing(42, 0)
+	:setMargin(8)
+	:setSize(32, 32)
 	:set("list", require "nautslist")
 	:set("sprite", love.graphics.newImage("assets/portraits.png"))
 	:set("quads", require "portraits")
@@ -16,8 +17,9 @@ Selector = {
 	parent,
 	x = 0,
 	y = 0,
-	horizontal = 0,
+	width = 0,
 	height = 0,
+	margin = 0,
 	focused = false,
 	global = false,
 	list,
@@ -46,12 +48,21 @@ function Selector:setPosition(x,y)
 	return self
 end
 
--- Spacing between positions of two blocks
-function Selector:getSpacing()
-	return self.horizontal, self.vertical
+-- Size of single block
+function Selector:getSize()
+	return self.width, self.height
 end
-function Selector:setSpacing(horizontal, vertical)
-	self.horizontal, self.vertical = horizontal, vertical
+function Selector:setSize(width, height)
+	self.width, self.height = width, height
+	return self
+end
+
+-- Spacing between two blocks
+function Selector:getMargin()
+	return self.margin
+end
+function Selector:setMargin(margin)
+	self.margin = margin
 	return self
 end
 
@@ -169,10 +180,11 @@ end
 -- LÖVE2D callbacks
 function Selector:draw(scale)
 	local x,y = self:getPosition()
-	local h,v = self:getSpacing()
-	x = #self.sets*h*0.5
+	local margin = self:getMargin()
+	local width = self:getSize()
+	x = x - #self.selections*0.5*(margin+margin+width)
 	for n=1,#self.selections do
-		self:drawBlock(n, x+h*n, y+v*n, scale)
+		self:drawBlock(n, x+(margin+width)*(n-1)+margin*n, y, scale)
 	end
 end
 function Selector:update(dt) end
-- 
cgit v1.1