Merge branch 'next' of https://github.com/seanpaultaylor/GamePlay into next

gameplay/src/Control.cpp

@@ -226,6 +226,18 @@ void Control::initialize(const char* typeName, Theme::Style* style, Properties*
         // Parse the auto-size mode for the control (this overrides explicit sizes and legacy autoWidth/autoHeight)
         _autoSize = parseAutoSize(properties->getString("autoSize"));
 
+        // If there is are simple padding or margin variables, parse them
+        if (properties->exists("padding"))
+        {
+            float pad = properties->getFloat("padding");
+            setPadding(pad, pad, pad, pad);
+        }
+        if (properties->exists("margin"))
+        {
+            float margin = properties->getFloat("margin");
+            setPadding(margin, margin, margin, margin);
+        }
+
 		if (properties->exists("enabled"))
 		{
 			setEnabled(properties->getBool("enabled"));

gameplay/src/Form.cpp

@@ -969,7 +969,7 @@ void Form::resizeEventInternal(unsigned int width, unsigned int height)
         if (form)
         {
             // Dirty the form
-            form->setDirty(Control::DIRTY_STATE);
+            form->setDirty(Control::DIRTY_BOUNDS | Control::DIRTY_STATE);
         }
     }
 }

gameplay/src/RenderState.h

@@ -221,8 +221,8 @@ public:
      */
     enum FrontFace
     {
-        FRONT_FACE_CW,
-        FRONT_FACE_CCW
+        FRONT_FACE_CW = GL_CW,
+        FRONT_FACE_CC = GL_CCW
     };
 
 	/**