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

Ensure doInteractivePlacement enforces snap option 

Fixes https://gitlab.com/kicad/code/kicad/issues/9105
This commit is contained in:
Seth Hillbrand 2021-09-06 06:35:36 -07:00
parent c861fadc31
commit 86725db758
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pcbnew/tools/pcb_tool_base.cpp
View File

@ -28,9 +28,11 @@
#include <footprint.h> #include <footprint.h>
#include <pcb_draw_panel_gal.h> #include <pcb_draw_panel_gal.h>
#include <pcbnew_settings.h> #include <pcbnew_settings.h>
#include "pcb_selection_tool.h"
#include "pcb_actions.h" #include <tools/pcb_grid_helper.h>
#include "tool_event_utils.h" #include <tools/pcb_selection_tool.h>
#include <tools/pcb_actions.h>
#include <tools/tool_event_utils.h>
void PCB_TOOL_BASE::doInteractiveItemPlacement( const std::string& aTool, void PCB_TOOL_BASE::doInteractiveItemPlacement( const std::string& aTool,
INTERACTIVE_PLACER_BASE* aPlacer, INTERACTIVE_PLACER_BASE* aPlacer,
@ -49,6 +51,8 @@ void PCB_TOOL_BASE::doInteractiveItemPlacement( const std::string& aTool,
// do not capture or auto-pan until we start placing an item // do not capture or auto-pan until we start placing an item
controls()->ShowCursor( true ); controls()->ShowCursor( true );
PCB_GRID_HELPER grid( m_toolMgr, frame()->GetMagneticItemsSettings() );
// Add a VIEW_GROUP that serves as a preview for the new item // Add a VIEW_GROUP that serves as a preview for the new item
PCB_SELECTION preview; PCB_SELECTION preview;
view()->Add( &preview ); view()->Add( &preview );
@ -98,7 +102,10 @@ void PCB_TOOL_BASE::doInteractiveItemPlacement( const std::string& aTool,
{ {
setCursor(); setCursor();
VECTOR2I cursorPos = controls()->GetCursorPosition(); grid.SetSnap( false ); // Interactive placement tools need to set their own item snaps
grid.SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() );
VECTOR2I cursorPos = grid.BestSnapAnchor( controls()->GetMousePosition(), nullptr );
aPlacer->m_modifiers = evt->Modifier(); aPlacer->m_modifiers = evt->Modifier();
auto cleanup = auto cleanup =