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

more efficient version of the wxUniv scrolling fix: don't call Update() in cases when ScrollWindow() wouldn't be called

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-11-08 12:20:21 +00:00
parent 4ca64d4137
commit b97dc9c8bc
1 changed files with 55 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/generic/scrlwing.cpp
View File

@@ -462,26 +462,10 @@ void wxScrollHelper::HandleOnScroll(wxScrollWinEvent& event)
return; return;
} }
// flush all pending repaints before we change m_{x,y}ScrollPosition, as
// otherwise invalidated area could be updated incorrectly later when
// ScrollWindow() makes sure they're repainted before scrolling them
m_targetWindow->Update();
int orient = event.GetOrientation();
if (orient == wxHORIZONTAL)
{
m_xScrollPosition += nScrollInc;
m_win->SetScrollPos(wxHORIZONTAL, m_xScrollPosition);
}
else
{
m_yScrollPosition += nScrollInc;
m_win->SetScrollPos(wxVERTICAL, m_yScrollPosition);
}
bool needsRefresh = false; bool needsRefresh = false;
int dx = 0, int dx = 0,
dy = 0; dy = 0;
int orient = event.GetOrientation();
if (orient == wxHORIZONTAL) if (orient == wxHORIZONTAL)
{ {
if ( m_xScrollingEnabled ) if ( m_xScrollingEnabled )
@@ -505,6 +489,25 @@ void wxScrollHelper::HandleOnScroll(wxScrollWinEvent& event)
} }
} }
if ( !needsRefresh )
{
// flush all pending repaints before we change m_{x,y}ScrollPosition, as
// otherwise invalidated area could be updated incorrectly later when
// ScrollWindow() makes sure they're repainted before scrolling them
m_targetWindow->Update();
}
if (orient == wxHORIZONTAL)
{
m_xScrollPosition += nScrollInc;
m_win->SetScrollPos(wxHORIZONTAL, m_xScrollPosition);
}
else
{
m_yScrollPosition += nScrollInc;
m_win->SetScrollPos(wxVERTICAL, m_yScrollPosition);
}
if ( needsRefresh ) if ( needsRefresh )
{ {
m_targetWindow->Refresh(true, GetScrollRect()); m_targetWindow->Refresh(true, GetScrollRect());
@@ -899,15 +902,13 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos )
int w = 0, h = 0; int w = 0, h = 0;
GetTargetSize(&w, &h); GetTargetSize(&w, &h);
// flush all pending repaints before we change m_{x,y}ScrollPosition, as // compute new position:
// otherwise invalidated area could be updated incorrectly later when int new_x = m_xScrollPosition;
// ScrollWindow() makes sure they're repainted before scrolling them int new_y = m_yScrollPosition;
m_targetWindow->Update();
if ((x_pos != -1) && (m_xScrollPixelsPerLine)) if ((x_pos != -1) && (m_xScrollPixelsPerLine))
{ {
int old_x = m_xScrollPosition; new_x = x_pos;
m_xScrollPosition = x_pos;
// Calculate page size i.e. number of scroll units you get on the // Calculate page size i.e. number of scroll units you get on the
// current client window // current client window
@@ -916,20 +917,12 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos )
// Correct position if greater than extent of canvas minus // Correct position if greater than extent of canvas minus
// the visible portion of it or if below zero // the visible portion of it or if below zero
m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition ); new_x = wxMin( m_xScrollLines-noPagePositions, new_x );
m_xScrollPosition = wxMax( 0, m_xScrollPosition ); new_x = wxMax( 0, new_x );
if (old_x != m_xScrollPosition)
{
m_win->SetScrollPos( wxHORIZONTAL, m_xScrollPosition );
m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0,
GetScrollRect() );
}
} }
if ((y_pos != -1) && (m_yScrollPixelsPerLine)) if ((y_pos != -1) && (m_yScrollPixelsPerLine))
{ {
int old_y = m_yScrollPosition; new_y = y_pos;
m_yScrollPosition = y_pos;
// Calculate page size i.e. number of scroll units you get on the // Calculate page size i.e. number of scroll units you get on the
// current client window // current client window
@@ -938,15 +931,35 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos )
// Correct position if greater than extent of canvas minus // Correct position if greater than extent of canvas minus
// the visible portion of it or if below zero // the visible portion of it or if below zero
m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition ); new_y = wxMin( m_yScrollLines-noPagePositions, new_y );
m_yScrollPosition = wxMax( 0, m_yScrollPosition ); new_y = wxMax( 0, new_y );
}
if (old_y != m_yScrollPosition) if ( new_x == m_xScrollPosition && new_y == m_yScrollPosition )
{ return; // nothing to do, the position didn't change
m_win->SetScrollPos( wxVERTICAL, m_yScrollPosition );
m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine, // flush all pending repaints before we change m_{x,y}ScrollPosition, as
GetScrollRect() ); // otherwise invalidated area could be updated incorrectly later when
} // ScrollWindow() makes sure they're repainted before scrolling them
m_targetWindow->Update();
// update the position and scroll the window now:
if (m_xScrollPosition != new_x)
{
int old_x = m_xScrollPosition;
m_xScrollPosition = new_x;
m_win->SetScrollPos( wxHORIZONTAL, new_x );
m_targetWindow->ScrollWindow( (old_x-new_x)*m_xScrollPixelsPerLine, 0,
GetScrollRect() );
}
if (m_yScrollPosition != new_y)
{
int old_y = m_yScrollPosition;
m_yScrollPosition = new_y;
m_win->SetScrollPos( wxVERTICAL, new_y );
m_targetWindow->ScrollWindow( 0, (old_y-new_y)*m_yScrollPixelsPerLine,
GetScrollRect() );
} }
} }