Merge pull request #32 from TotoEnF5/layout

fix uninitialized variables in container layout

layout/container.lua

@@ -1,8 +1,8 @@
-local path   = string.sub(..., 1, string.len(...) - string.len(".container"))
+local path        = string.sub(..., 1, string.len(...) - string.len(".container"))
-local layout = require(path..'.layout')
+local layout      = require(path .. '.layout')
 
 ---@class Container
-local container = {}
+local container   = {}
 container.__index = container
 
 ---Positions an element within a container
@@ -14,7 +14,7 @@ function container.new(halign, valign)
 		halign = halign or 'left',
 		valign = valign or 'top',
 	}, container)
-	
+
 	return layout(self, self.draw)
 end
 
@@ -23,11 +23,11 @@ local function alignLeft(x, wroot, wchild)
 end
 
 local function alignCenter(x, wroot, wchild)
-	return x+(wroot/2-wchild/2)
+	return x + (wroot / 2 - wchild / 2)
 end
 
 local function alignRight(x, wroot, wchild)
-	return x+(wroot-wchild)
+	return x + (wroot - wchild)
 end
 
 
@@ -53,23 +53,22 @@ end
 
 function container:draw(x, y, width, height, children, hpad, vpad, alignX)
 	local w, h = children[1]:getSize()
-	local x, y 
 
-	if self.halign =='stretch' then
+	if self.halign == 'stretch' then
 		w = width
 		x = x
 	else
-		x = alignHandlerX(self.halign, containerX, containerWidth, w)
+		x = alignHandlerX(self.halign, x, width, w)
 	end
 
-	if self.valign =='stretch' then
+	if self.valign == 'stretch' then
-		h = h
+		h = height
 		y = y
 	else
-		y = alignHandlerY(self.valign, containerY, containerHeight, h)
+		y = alignHandlerY(self.valign, y, height, h)
 	end
 
 	children[1]:draw(x, y, w, h)
 end
 
-return container
+return container