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

Do not warp viewport when dragging FPs 

Fixes: lp:1714611
* https://bugs.launchpad.net/kicad/+bug/1714611
This commit is contained in:
Michael Geselbracht 2017-09-22 10:59:42 +02:00 committed by Maciej Suminski
parent 427e5ec461
commit da037027fb
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/view/wx_view_controls.cpp
View File

@ -443,10 +443,10 @@ VECTOR2D WX_VIEW_CONTROLS::GetCursorPosition( bool aEnableSnapping ) const
}
void WX_VIEW_CONTROLS::SetCursorPosition( const VECTOR2D& aPosition )
void WX_VIEW_CONTROLS::SetCursorPosition( const VECTOR2D& aPosition, bool aWarpView )
{
m_updateCursor = false;
WarpCursor( aPosition, true, true );
WarpCursor( aPosition, true, aWarpView );
m_cursorPos = aPosition;
}

3
include/view/view_controls.h
View File

@ -210,8 +210,9 @@ public:
* forced and will be overridden with the next mouse motion event. Mouse cursor follows the
* world cursor.
* @param aPosition is the requested cursor position in the world coordinates.
* @param aWarpView enables/disables view warp if the cursor is outside the current viewport.
*/
virtual void SetCursorPosition( const VECTOR2D& aPosition ) = 0;
virtual void SetCursorPosition( const VECTOR2D& aPosition, bool aWarpView = true ) = 0;
/**
* Function ForcedCursorPosition()

2
include/view/wx_view_controls.h
View File

@ -78,7 +78,7 @@ public:
/// @copydoc VIEW_CONTROLS::GetCursorPosition()
VECTOR2D GetCursorPosition( bool aSnappingEnabled ) const override;
void SetCursorPosition( const VECTOR2D& aPosition ) override;
void SetCursorPosition( const VECTOR2D& aPosition, bool warpView ) override;
/// @copydoc VIEW_CONTROLS::CursorWarp()
void WarpCursor( const VECTOR2D& aPosition, bool aWorldCoordinates = false,

2
pcbnew/tools/edit_tool.cpp
View File

@ -442,7 +442,7 @@ int EDIT_TOOL::Main( const TOOL_EVENT& aEvent )
m_cursor = grid.Align( m_cursor );
}
controls->SetCursorPosition( m_cursor );
controls->SetCursorPosition( m_cursor, false );
VECTOR2I o = VECTOR2I( curr_item->GetPosition() );
m_offset.x = o.x - m_cursor.x;