From 2cf8a656ee06e015c7169d5afa5d665faec0b9f4 Mon Sep 17 00:00:00 2001
From: Fox <paul.liverman.iii@gmail.com>
Date: Fri, 22 Jan 2016 09:00:23 -0800
Subject: [PATCH] fixed movement bug + move args to setSize() optional

---
 .gitignore               |  1 +
 pop/elements/element.lua | 37 ++++++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a19f1fe
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+busted/
diff --git a/pop/elements/element.lua b/pop/elements/element.lua
index cde5378..3201841 100644
--- a/pop/elements/element.lua
+++ b/pop/elements/element.lua
@@ -20,9 +20,9 @@ function element:move(x, y)
     self.x = self.x + x
     self.y = self.y + y
 
-    for i=1,#element.child do
-        if not element.child[i].excludeMovement then
-            element.child[i]:move(x - oldX, y - oldY)
+    for i=1,#self.child do
+        if not self.child[i].excludeMovement then
+            self.child[i]:move(x - oldX, y - oldY)
         end
     end
 
@@ -49,9 +49,9 @@ function element:setPosition(x, y)
         self.y = y - self.h
     end
 
-    for i=1,#element.child do
-        if not element.child[i].excludeMovement then
-            element.child[i]:move(x - oldX, y - oldY)
+    for i=1,#self.child do
+        if not self.child[i].excludeMovement then
+            self.child[i]:move(x - oldX, y - oldY)
         end
     end
 
@@ -78,21 +78,24 @@ function element:getPosition()
 end
 
 function element:setSize(w, h)
-    if self.horizontal == "center" then
-        self.x = self.x - (w - self.w)/2
-    elseif self.horizontal == "right" then
-        self.x = self.x - (w - self.w)
+    if w then
+        if self.horizontal == "center" then
+            self.x = self.x - (w - self.w)/2
+        elseif self.horizontal == "right" then
+            self.x = self.x - (w - self.w)
+        end
+        self.w = w
     end
 
-    if self.vertical == "center" then
-        self.y = self.y - (h - self.h)/2
-    elseif self.vertical == "bottom" then
-        self.y = self.y - (h - self.h)
+    if h then
+        if self.vertical == "center" then
+            self.y = self.y - (h - self.h)/2
+        elseif self.vertical == "bottom" then
+            self.y = self.y - (h - self.h)
+        end
+        self.h = h
     end
 
-    self.w = w
-    self.h = h
-
     return self
 end