From ff8c74b972eb4305240dd1b240e4fd24f8007028 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Wed, 4 Feb 2009 21:28:00 +0000 Subject: [PATCH] Use gtk_range_set_value() to set scrollbar and do that after SetVirtualSize() since the latter can shrink the legal range and gtk_range_set_value() checks for that. It also sends out a value_changed signal which will scroll the window git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/scrolwin.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp index c4739a30a6..76b7d458a9 100644 --- a/src/gtk/scrolwin.cpp +++ b/src/gtk/scrolwin.cpp @@ -39,27 +39,23 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, int xPos, int yPos, - bool noRefresh) + bool WXUNUSED(noRefresh)) { m_xScrollPixelsPerLine = pixelsPerUnitX; m_yScrollPixelsPerLine = pixelsPerUnitY; - m_win->m_scrollBar[wxWindow::ScrollDir_Horz]->adjustment->value = - m_xScrollPosition = xPos; - m_win->m_scrollBar[wxWindow::ScrollDir_Vert]->adjustment->value = - m_yScrollPosition = yPos; - int w = noUnitsX * pixelsPerUnitX; int h = noUnitsY * pixelsPerUnitY; m_targetWindow->SetVirtualSize( w ? w : wxDefaultCoord, h ? h : wxDefaultCoord); - // Query view start after m_targetWindow->SetVirtualSize(...) since - // that call can change the current=old scrolling position! - int xs, ys; - GetViewStart(& xs, & ys); - int old_x = m_xScrollPixelsPerLine * xs; - int old_y = m_yScrollPixelsPerLine * ys; + GtkRange *sb = m_win->m_scrollBar[wxWindow::ScrollDir_Vert]; + gtk_range_set_value(sb, yPos); + sb = m_win->m_scrollBar[wxWindow::ScrollDir_Horz]; + gtk_range_set_value(sb, xPos); + + m_xScrollPosition = wxRound( m_win->m_scrollBar[wxWindow::ScrollDir_Horz]->adjustment->value ); + m_yScrollPosition = wxRound( m_win->m_scrollBar[wxWindow::ScrollDir_Vert]->adjustment->value ); // If the target is not the same as the window with the scrollbars, // then we need to update the scrollbars here, since they won't have @@ -69,6 +65,7 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, AdjustScrollbars(); } +#if 0 if (!noRefresh) { int new_x = m_xScrollPixelsPerLine * m_xScrollPosition; @@ -76,6 +73,7 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, m_targetWindow->ScrollWindow( old_x - new_x, old_y - new_y ); } +#endif } void wxScrollHelper::DoAdjustScrollbar(GtkRange* range, -- 2.45.2