Reviewed by ggaren.

        Fix scrollbars to reappear after the first layouting.

        * platform/qt/ScrollViewQt.cpp:
        (WebCore::ScrollView::suppressScrollBars):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16095 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2192fdd97e24546101d834579a502a7fde2c32e8..b67055ea035c81a724bdb5b691abde9296ef7ef7 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-29  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by ggaren.
+
+        Fix scrollbars to reappear after the first layouting.
+
+        * platform/qt/ScrollViewQt.cpp:
+        (WebCore::ScrollView::suppressScrollBars):
+
 2006-08-29  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Darin and Geoff.

diff --git a/WebCore/platform/qt/ScrollViewQt.cpp b/WebCore/platform/qt/ScrollViewQt.cpp
index 6161ba2dd22bf7f4a34d019a1cfc548078852e37..1707876498df2f0b92425d5a09574d4de62a8b2d 100644 (file)
--- a/WebCore/platform/qt/ScrollViewQt.cpp
+++ b/WebCore/platform/qt/ScrollViewQt.cpp
@@ -183,10 +183,9 @@ ScrollBarMode ScrollView::vScrollBarMode() const
     return ScrollBarAuto;
 }
 
-void ScrollView::suppressScrollBars(bool suppressed, bool repaintOnSuppress)
+void ScrollView::suppressScrollBars(bool suppressed, bool /* repaintOnSuppress */)
 {
-    // FIXME: Is this correct?
-    setScrollBarsMode(ScrollBarAlwaysOff);
+    setScrollBarsMode(suppressed ? ScrollBarAlwaysOff : ScrollBarAuto);
 }
 
 void ScrollView::setHScrollBarMode(ScrollBarMode newMode)