From b732c984039bd836224573d1fc25971e8c0c6f12 Mon Sep 17 00:00:00 2001 From: Michael Geselbracht Date: Sat, 2 Sep 2017 01:29:51 +0200 Subject: [PATCH] Do not warp viewport when draggin FPs --- common/view/wx_view_controls.cpp | 4 ++-- include/view/view_controls.h | 2 +- include/view/wx_view_controls.h | 2 +- pcbnew/tools/edit_tool.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/view/wx_view_controls.cpp b/common/view/wx_view_controls.cpp index 9f9dcdc8b..9c1ee1719 100644 --- a/common/view/wx_view_controls.cpp +++ b/common/view/wx_view_controls.cpp @@ -385,10 +385,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 warpView ) { m_updateCursor = false; - WarpCursor( aPosition, true, true ); + WarpCursor( aPosition, true, warpView ); m_cursorPos = aPosition; } diff --git a/include/view/view_controls.h b/include/view/view_controls.h index acc2df395..4c9857529 100644 --- a/include/view/view_controls.h +++ b/include/view/view_controls.h @@ -205,7 +205,7 @@ public: * world cursor. * @param aPosition is the requested cursor position in the world coordinates. */ - virtual void SetCursorPosition( const VECTOR2D& aPosition ) = 0; + virtual void SetCursorPosition( const VECTOR2D& aPosition, bool warpView=true ) = 0; /** * Function ForcedCursorPosition() diff --git a/include/view/wx_view_controls.h b/include/view/wx_view_controls.h index ce2387fdf..f1506bcde 100644 --- a/include/view/wx_view_controls.h +++ b/include/view/wx_view_controls.h @@ -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, diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp index 06bcf674d..ef6cc2b28 100644 --- a/pcbnew/tools/edit_tool.cpp +++ b/pcbnew/tools/edit_tool.cpp @@ -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; -- 2.14.1