Removed LAYOUT_SCROLL from Layout::Type enumeration as all containers can now scroll, not depending on layout type.

gameplay/src/Container.cpp

@@ -602,10 +602,6 @@ Layout::Type Container::getLayoutType(const char* layoutString)
     {
         return Layout::LAYOUT_FLOW;
     }
-    else if (layoutName == "LAYOUT_SCROLL")
-    {
-        return Layout::LAYOUT_SCROLL;
-    }
     else
     {
         // Default.

gameplay/src/Layout.h

@@ -45,15 +45,7 @@ public:
          * Absolute layout: Controls are not modified at all by this layout.
          * They must be positioned and sized manually.
          */
-        LAYOUT_ABSOLUTE,
-
-        /**
-         * Scroll layout: Controls may be placed outside the bounds of the container.
-         * The user can then touch and drag to scroll.  By default controls are placed
-         * based on absolute positions in the .form file, but vertical or horizontal
-         * automatic positioning is an available option.
-         */
-        LAYOUT_SCROLL
+        LAYOUT_ABSOLUTE
     };
 
     /**

gameplay/src/lua/lua_Global.cpp

@@ -554,7 +554,6 @@ void luaRegister_lua_Global()
         ScriptUtil::registerConstantString("LAYOUT_FLOW", "LAYOUT_FLOW", scopePath);
         ScriptUtil::registerConstantString("LAYOUT_VERTICAL", "LAYOUT_VERTICAL", scopePath);
         ScriptUtil::registerConstantString("LAYOUT_ABSOLUTE", "LAYOUT_ABSOLUTE", scopePath);
-        ScriptUtil::registerConstantString("LAYOUT_SCROLL", "LAYOUT_SCROLL", scopePath);
     }
 
     // Register enumeration Light::Type.

gameplay/src/lua/lua_LayoutType.cpp

@@ -9,7 +9,6 @@ static const char* enumStringEmpty = "";
 static const char* luaEnumString_LayoutType_LAYOUT_FLOW = "LAYOUT_FLOW";
 static const char* luaEnumString_LayoutType_LAYOUT_VERTICAL = "LAYOUT_VERTICAL";
 static const char* luaEnumString_LayoutType_LAYOUT_ABSOLUTE = "LAYOUT_ABSOLUTE";
-static const char* luaEnumString_LayoutType_LAYOUT_SCROLL = "LAYOUT_SCROLL";
 
 Layout::Type lua_enumFromString_LayoutType(const char* s)
 {
@@ -19,8 +18,6 @@ Layout::Type lua_enumFromString_LayoutType(const char* s)
         return Layout::LAYOUT_VERTICAL;
     if (strcmp(s, luaEnumString_LayoutType_LAYOUT_ABSOLUTE) == 0)
         return Layout::LAYOUT_ABSOLUTE;
-    if (strcmp(s, luaEnumString_LayoutType_LAYOUT_SCROLL) == 0)
-        return Layout::LAYOUT_SCROLL;
     GP_ERROR("Invalid enumeration value '%s' for enumeration Layout::Type.", s);
     return Layout::LAYOUT_FLOW;
 }
@@ -33,8 +30,6 @@ const char* lua_stringFromEnum_LayoutType(Layout::Type e)
         return luaEnumString_LayoutType_LAYOUT_VERTICAL;
     if (e == Layout::LAYOUT_ABSOLUTE)
         return luaEnumString_LayoutType_LAYOUT_ABSOLUTE;
-    if (e == Layout::LAYOUT_SCROLL)
-        return luaEnumString_LayoutType_LAYOUT_SCROLL;
     GP_ERROR("Invalid enumeration value '%d' for enumeration Layout::Type.", e);
     return enumStringEmpty;
 }