Merge pull request #483 from ablake/next

Adding a form to the TextTest

gameplay/src/Container.cpp

@@ -365,6 +365,9 @@ bool Container::isScrollBarsAutoHide() const
 
 bool Container::isScrolling() const
 {
+    if (_parent && _parent->isScrolling())
+        return true;
+
     return (_scrolling &&
             (abs(_scrollingLastX - _scrollingFirstX) > SCROLL_THRESHOLD ||
              abs(_scrollingLastY - _scrollingFirstY) > SCROLL_THRESHOLD));