From f2e9222d6e87646875fa1944bbffce14d778cd05 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 10 Nov 2002 10:25:02 +0000 Subject: [PATCH] Further corrections to GTK's scrolling widget. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/scrolwin.cpp | 40 +++++++++++++++++++++------------------- src/gtk1/scrolwin.cpp | 40 +++++++++++++++++++++------------------- 2 files changed, 42 insertions(+), 38 deletions(-) diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp index 4a8dd9490f..82fc6e8b9a 100644 --- a/src/gtk/scrolwin.cpp +++ b/src/gtk/scrolwin.cpp @@ -349,16 +349,10 @@ void wxScrolledWindow::SetScrollbars( int pixelsPerUnitX, int pixelsPerUnitY, m_hAdjust->value = m_xScrollPosition = xPos; m_vAdjust->value = m_yScrollPosition = yPos; - // For better backward compatibility we set persisting limits - // here not just the size. It makes SetScrollbars 'sticky' - // emulating the old non-autoscroll behaviour. - - m_targetWindow->SetVirtualSizeHints( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY ); - - // The above should arguably be deprecated, this however we still need. - + // The first line should arguably be deprecated, the second we still need. m_targetWindow->SetVirtualSize( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY ); - + m_targetWindow->SetVirtualSize( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY ); + if (!noRefresh) { int new_x = m_xScrollPixelsPerLine * m_xScrollPosition; @@ -389,13 +383,16 @@ void wxScrolledWindow::AdjustScrollbars() // If the scrollbar hits the right side, move the window // right to keep it from over extending. - if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper ) + if ((m_hAdjust->value != 0.0) && (m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper)) { + m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size; + if (m_hAdjust->value < 0.0) + m_hAdjust->value = 0.0; + if (GetChildren().GetCount() == 0) - { - m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size; - m_xScrollPosition = (int)m_hAdjust->value; - } + m_xScrollPosition = (int)m_hAdjust->value; // This is enough without child windows + else + gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" ); // Actually scroll window } } @@ -409,13 +406,16 @@ void wxScrolledWindow::AdjustScrollbars() m_vAdjust->upper = vh / m_yScrollPixelsPerLine; m_vAdjust->page_size = (h / m_yScrollPixelsPerLine); - if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper ) + if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper)) { + m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size; + if (m_vAdjust->value < 0.0) + m_vAdjust->value = 0.0; + if (GetChildren().GetCount() == 0) - { - m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size; - m_yScrollPosition = (int)m_vAdjust->value; - } + m_yScrollPosition = (int)m_vAdjust->value; + else + gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" ); } } @@ -839,7 +839,9 @@ void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event)) FitInside(); } else + { AdjustScrollbars(); + } } // This calls OnDraw, having adjusted the origin according to the current diff --git a/src/gtk1/scrolwin.cpp b/src/gtk1/scrolwin.cpp index 4a8dd9490f..82fc6e8b9a 100644 --- a/src/gtk1/scrolwin.cpp +++ b/src/gtk1/scrolwin.cpp @@ -349,16 +349,10 @@ void wxScrolledWindow::SetScrollbars( int pixelsPerUnitX, int pixelsPerUnitY, m_hAdjust->value = m_xScrollPosition = xPos; m_vAdjust->value = m_yScrollPosition = yPos; - // For better backward compatibility we set persisting limits - // here not just the size. It makes SetScrollbars 'sticky' - // emulating the old non-autoscroll behaviour. - - m_targetWindow->SetVirtualSizeHints( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY ); - - // The above should arguably be deprecated, this however we still need. - + // The first line should arguably be deprecated, the second we still need. m_targetWindow->SetVirtualSize( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY ); - + m_targetWindow->SetVirtualSize( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY ); + if (!noRefresh) { int new_x = m_xScrollPixelsPerLine * m_xScrollPosition; @@ -389,13 +383,16 @@ void wxScrolledWindow::AdjustScrollbars() // If the scrollbar hits the right side, move the window // right to keep it from over extending. - if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper ) + if ((m_hAdjust->value != 0.0) && (m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper)) { + m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size; + if (m_hAdjust->value < 0.0) + m_hAdjust->value = 0.0; + if (GetChildren().GetCount() == 0) - { - m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size; - m_xScrollPosition = (int)m_hAdjust->value; - } + m_xScrollPosition = (int)m_hAdjust->value; // This is enough without child windows + else + gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" ); // Actually scroll window } } @@ -409,13 +406,16 @@ void wxScrolledWindow::AdjustScrollbars() m_vAdjust->upper = vh / m_yScrollPixelsPerLine; m_vAdjust->page_size = (h / m_yScrollPixelsPerLine); - if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper ) + if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper)) { + m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size; + if (m_vAdjust->value < 0.0) + m_vAdjust->value = 0.0; + if (GetChildren().GetCount() == 0) - { - m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size; - m_yScrollPosition = (int)m_vAdjust->value; - } + m_yScrollPosition = (int)m_vAdjust->value; + else + gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" ); } } @@ -839,7 +839,9 @@ void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event)) FitInside(); } else + { AdjustScrollbars(); + } } // This calls OnDraw, having adjusted the origin according to the current