Picking up now possible with Z, and fixed width of a few scroll area contents.

1 files changed, 21 insertions, 0 deletions

diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index ad31ada8..319025a0 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -137,6 +137,27 @@ void ScrollArea::init()
     instances++;
 }
 
+void ScrollArea::logic()
+{
+    gcn::ScrollArea::logic();
+
+    // When no scrollbar in a certain direction, adapt content size to match
+    // the content dimension exactly.
+    if (mContent != NULL)
+    {
+        if (getHorizontalScrollPolicy() == gcn::ScrollArea::SHOW_NEVER)
+        {
+            mContent->setWidth(getContentDimension().width -
+                    2 * mContent->getBorderSize());
+        }
+        if (getVerticalScrollPolicy() == gcn::ScrollArea::SHOW_NEVER)
+        {
+            mContent->setHeight(getContentDimension().height -
+                    2 * mContent->getBorderSize());
+        }
+    }
+}
+
 void ScrollArea::draw(gcn::Graphics *graphics)
 {
     checkPolicies();