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

fix bug introduced in last commit, contents not scrolling when selecting treectrl elements with up/down arrow keys

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-02-04 07:15:03 +00:00
parent 58fa61dbad
commit cdb7bf6671
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/gtk/scrolwin.cpp
View File

@@ -41,6 +41,9 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
int xPos, int yPos, int xPos, int yPos,
bool noRefresh) bool noRefresh)
{ {
int old_x = m_xScrollPosition * m_xScrollPixelsPerLine;
int old_y = m_yScrollPosition * m_yScrollPixelsPerLine;
m_xScrollPixelsPerLine = pixelsPerUnitX; m_xScrollPixelsPerLine = pixelsPerUnitX;
m_yScrollPixelsPerLine = pixelsPerUnitY; m_yScrollPixelsPerLine = pixelsPerUnitY;
@@ -49,21 +52,28 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
m_win->m_scrollBar[wxWindow::ScrollDir_Vert]->adjustment->value = m_win->m_scrollBar[wxWindow::ScrollDir_Vert]->adjustment->value =
m_yScrollPosition = yPos; m_yScrollPosition = yPos;
// Setting hints here should arguably be deprecated, but without it // To get everything right, have to call ScrollWindow()
// a sizer might override this manual scrollbar setting in old code. // both before and after calling SetVirtualSize()
// m_targetWindow->SetVirtualSizeHints( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY ); int new_x = m_xScrollPosition * m_xScrollPixelsPerLine;
int new_y = m_yScrollPosition * m_yScrollPixelsPerLine;
if (!noRefresh)
{
m_targetWindow->ScrollWindow(old_x - new_x, old_y - new_y);
old_x = new_x;
old_y = new_y;
}
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 if (!noRefresh)
// that call can change the current=old scrolling position! {
int xs, ys; new_x = m_xScrollPosition * m_xScrollPixelsPerLine;
GetViewStart(& xs, & ys); new_y = m_yScrollPosition * m_yScrollPixelsPerLine;
int old_x = m_xScrollPixelsPerLine * xs; m_targetWindow->ScrollWindow(old_x - new_x, old_y - new_y);
int old_y = m_yScrollPixelsPerLine * ys; }
// 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
@@ -72,14 +82,6 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
{ {
AdjustScrollbars(); AdjustScrollbars();
} }
if (!noRefresh)
{
int new_x = m_xScrollPixelsPerLine * m_xScrollPosition;
int new_y = m_yScrollPixelsPerLine * m_yScrollPosition;
m_targetWindow->ScrollWindow( old_x - new_x, old_y - new_y );
}
} }
void wxScrollHelper::DoAdjustScrollbar(GtkRange* range, void wxScrollHelper::DoAdjustScrollbar(GtkRange* range,