eliminate the hysteresis when scrollbars didn't disappear when the window was resized...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 7519c5c58961b4a9cbd0a0742bb3a430c2b8edb1..2f9bc568fa66cc6bedc1a9d6da3383a138c91040 100644 (file)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -122,13 +122,26 @@ void wxScrollHelperNative::DoAdjustScrollbar(GtkRange* range,
 void wxScrollHelperNative::AdjustScrollbars()
 {
     int vw, vh;
 void wxScrollHelperNative::AdjustScrollbars()
 {
     int vw, vh;

-    m_targetWindow->GetVirtualSize( &vw, &vh );
+    m_targetWindow->GetVirtualSize(&vw, &vh);
+
+    int w, h;
+    const wxSize availSize = GetSizeAvailableForScrollTarget(
+        m_win->GetSize() - m_win->GetWindowBorderSize());
+    if ( availSize.x >= vw && availSize.y >= vh )
+    {
+        w = availSize.x;
+        h = availSize.y;
+
+        // we know that the scrollbars will be removed
+        DoAdjustHScrollbar(w, vw);
+        DoAdjustVScrollbar(h, vh);
+
+        return;
+    }

 
 

-    int w;

     m_targetWindow->GetClientSize(&w, NULL);
     DoAdjustHScrollbar(w, vw);
 
     m_targetWindow->GetClientSize(&w, NULL);
     DoAdjustHScrollbar(w, vw);
 

-    int h;

     m_targetWindow->GetClientSize(NULL, &h);
     DoAdjustVScrollbar(h, vh);
 
     m_targetWindow->GetClientSize(NULL, &h);
     DoAdjustVScrollbar(h, vh);