Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-02-04 21:28:00 +00:00
parent e799e8d7d8
commit ff8c74b972
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gtk/scrolwin.cpp
View File

@@ -39,27 +39,23 @@
void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
int noUnitsX, int noUnitsY, int noUnitsX, int noUnitsY,
int xPos, int yPos, int xPos, int yPos,
bool noRefresh) bool WXUNUSED(noRefresh))
{ {
m_xScrollPixelsPerLine = pixelsPerUnitX; m_xScrollPixelsPerLine = pixelsPerUnitX;
m_yScrollPixelsPerLine = pixelsPerUnitY; 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 w = noUnitsX * pixelsPerUnitX;
int h = noUnitsY * pixelsPerUnitY; int h = noUnitsY * pixelsPerUnitY;
m_targetWindow->SetVirtualSize( w ? w : wxDefaultCoord, m_targetWindow->SetVirtualSize( w ? w : wxDefaultCoord,
h ? h : wxDefaultCoord); h ? h : wxDefaultCoord);
// Query view start after m_targetWindow->SetVirtualSize(...) since GtkRange *sb = m_win->m_scrollBar[wxWindow::ScrollDir_Vert];
// that call can change the current=old scrolling position! gtk_range_set_value(sb, yPos);
int xs, ys; sb = m_win->m_scrollBar[wxWindow::ScrollDir_Horz];
GetViewStart(& xs, & ys); gtk_range_set_value(sb, xPos);
int old_x = m_xScrollPixelsPerLine * xs;
int old_y = m_yScrollPixelsPerLine * ys; 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, // 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 // 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(); AdjustScrollbars();
} }
#if 0
if (!noRefresh) if (!noRefresh)
{ {
int new_x = m_xScrollPixelsPerLine * m_xScrollPosition; 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 ); m_targetWindow->ScrollWindow( old_x - new_x, old_y - new_y );
} }
#endif
} }
void wxScrollHelper::DoAdjustScrollbar(GtkRange* range, void wxScrollHelper::DoAdjustScrollbar(GtkRange* range,