Merge branch 'master' into stable

1 files changed, 17 insertions, 3 deletions

diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index b537dd2ed..e97dad715 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -257,7 +257,7 @@ void ScrollArea::draw(gcn::Graphics *graphics)
     BLOCK_START("ScrollArea::draw")
     if (mVBarVisible || mHBarVisible)
     {
-        if (openGLMode != RENDER_SAFE_OPENGL)
+        if (isBatchDrawRenders(openGLMode))
         {
             if (!mOpaque)
                 updateCalcFlag(graphics);
@@ -315,7 +315,19 @@ void ScrollArea::draw(gcn::Graphics *graphics)
     }
 
     updateAlpha();
-    drawChildren(graphics);
+
+    if (mRedraw)
+    {
+        Graphics *g = static_cast<Graphics *const>(graphics);
+        const bool redraw = g->getRedraw();
+        g->setRedraw(true);
+        drawChildren(graphics);
+        g->setRedraw(redraw);
+    }
+    else
+    {
+        drawChildren(graphics);
+    }
     mRedraw = false;
     BLOCK_END("ScrollArea::draw")
 }
@@ -358,7 +370,7 @@ void ScrollArea::drawFrame(gcn::Graphics *graphics)
 
         updateCalcFlag(graphics);
 
-        if (openGLMode != RENDER_SAFE_OPENGL)
+        if (isBatchDrawRenders(openGLMode))
         {
             if (mRedraw)
             {
@@ -787,6 +799,7 @@ void ScrollArea::mouseReleased(gcn::MouseEvent& event)
         }
     }
     gcn::ScrollArea::mouseReleased(event);
+    mRedraw = true;
 }
 
 void ScrollArea::mouseDragged(gcn::MouseEvent &event)
@@ -830,6 +843,7 @@ void ScrollArea::mouseDragged(gcn::MouseEvent &event)
     }
 
     event.consume();
+    mRedraw = true;
 }
 
 gcn::Rectangle ScrollArea::getVerticalBarDimension() const