haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Flip horizontal scrollbar behavior in flipped board view mode 

Fixes: lp:1741327
* https://bugs.launchpad.net/kicad/+bug/1741327
This commit is contained in:
Jon Evans 2018-01-04 16:56:58 -05:00 committed by Wayne Stambaugh
parent 38227161bf
commit 53ae5c36f4
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/view/wx_view_controls.cpp
View File

@ -347,8 +347,13 @@ void WX_VIEW_CONTROLS::onScroll( wxScrollWinEvent& aEvent )
VECTOR2D center = m_view->GetCenter();
const BOX2I& boundary = m_view->GetBoundary();
// Flip scroll direction in flipped view
const double xstart = ( m_view->IsMirroredX() ?
boundary.GetRight() : boundary.GetLeft() );
const double xdelta = ( m_view->IsMirroredX() ? -1 : 1 );
if( dir == wxHORIZONTAL )
center.x = boundary.GetLeft() + aEvent.GetPosition() / m_scrollScale.x;
center.x = xstart + xdelta * ( aEvent.GetPosition() / m_scrollScale.x );
else
center.y = boundary.GetTop() + aEvent.GetPosition() / m_scrollScale.y;
@ -580,6 +585,10 @@ void WX_VIEW_CONTROLS::UpdateScrollbars()
VECTOR2I newScroll( ( viewport.Centre().x - boundary.GetLeft() ) * m_scrollScale.x,
( viewport.Centre().y - boundary.GetTop() ) * m_scrollScale.y );
// Flip scroll direction in flipped view
if( m_view->IsMirroredX() )
newScroll.x = ( boundary.GetRight() - viewport.Centre().x ) * m_scrollScale.x;
// Adjust scrollbars only if it is needed. Otherwise there are cases when canvas is continuosly
// refreshed (Windows)
if( m_scrollPos != newScroll )