realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 10:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

CHANGED: Drawing tools can disable H/V/45 snap with Ctrl key

Browse Source 
Also disable 45-degree snapping for rectangle shapes; it is
not very intuitive to be limited to drawing squares when this
setting is on.
This commit is contained in:
Jon Evans 2024-12-02 12:04:18 -05:00
parent bf8a3c8afc
commit 196368eb86
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pcbnew/tools/drawing_tool.cpp
View File

@ -1410,6 +1410,7 @@ int DRAWING_TOOL::DrawDimension( const TOOL_EVENT& aEvent )
setCursor(); setCursor();
grid.SetSnap( !evt->Modifier( MD_SHIFT ) ); grid.SetSnap( !evt->Modifier( MD_SHIFT ) );
bool is45Limited = Is45Limited() && !evt->Modifier( MD_CTRL );
grid.SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() ); grid.SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() );
if( step == SET_HEIGHT && t != PCB_DIM_ORTHOGONAL_T ) if( step == SET_HEIGHT && t != PCB_DIM_ORTHOGONAL_T )
@ -1621,7 +1622,7 @@ int DRAWING_TOOL::DrawDimension( const TOOL_EVENT& aEvent )
case SET_END: case SET_END:
dimension->SetEnd( cursorPos ); dimension->SetEnd( cursorPos );
if( Is45Limited() || t == PCB_DIM_CENTER_T ) if( is45Limited || t == PCB_DIM_CENTER_T )
constrainDimension( dimension ); constrainDimension( dimension );
if( t == PCB_DIM_ORTHOGONAL_T ) if( t == PCB_DIM_ORTHOGONAL_T )
@ -2227,6 +2228,12 @@ bool DRAWING_TOOL::drawShape( const TOOL_EVENT& aTool, PCB_SHAPE** aGraphic,
m_frame->SetMsgPanel( graphic ); m_frame->SetMsgPanel( graphic );
grid.SetSnap( !evt->Modifier( MD_SHIFT ) ); grid.SetSnap( !evt->Modifier( MD_SHIFT ) );
bool is45Limited = Is45Limited() && !evt->Modifier( MD_CTRL );
// Rectangular shapes never get 45-degree snapping
if( shape == SHAPE_T::RECTANGLE )
is45Limited = false;
grid.SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() ); grid.SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() );
cursorPos = GetClampedCoords( cursorPos = GetClampedCoords(
grid.BestSnapAnchor( m_controls->GetMousePosition(), { m_layer }, GRID_GRAPHICS ), grid.BestSnapAnchor( m_controls->GetMousePosition(), { m_layer }, GRID_GRAPHICS ),
@ -2405,7 +2412,7 @@ bool DRAWING_TOOL::drawShape( const TOOL_EVENT& aTool, PCB_SHAPE** aGraphic,
clampedCursorPos = getClampedDifferenceEnd( twoPointMgr.GetOrigin(), cursorPos ); clampedCursorPos = getClampedDifferenceEnd( twoPointMgr.GetOrigin(), cursorPos );
// 45 degree lines // 45 degree lines
if( started && Is45Limited() ) if( started && is45Limited )
{ {
const VECTOR2I lineVector( clampedCursorPos - VECTOR2I( twoPointMgr.GetOrigin() ) ); const VECTOR2I lineVector( clampedCursorPos - VECTOR2I( twoPointMgr.GetOrigin() ) );
@ -2617,6 +2624,7 @@ bool DRAWING_TOOL::drawArc( const TOOL_EVENT& aTool, PCB_SHAPE** aGraphic,
graphic->SetLayer( m_layer ); graphic->SetLayer( m_layer );
grid.SetSnap( !evt->Modifier( MD_SHIFT ) ); grid.SetSnap( !evt->Modifier( MD_SHIFT ) );
bool is45Limited = Is45Limited() && !evt->Modifier( MD_CTRL );
grid.SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() ); grid.SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() );
VECTOR2I cursorPos = GetClampedCoords( VECTOR2I cursorPos = GetClampedCoords(
grid.BestSnapAnchor( m_controls->GetMousePosition(), graphic, GRID_GRAPHICS ), grid.BestSnapAnchor( m_controls->GetMousePosition(), graphic, GRID_GRAPHICS ),
@ -2692,7 +2700,7 @@ bool DRAWING_TOOL::drawArc( const TOOL_EVENT& aTool, PCB_SHAPE** aGraphic,
else if( evt->IsMotion() ) else if( evt->IsMotion() )
{ {
// set angle snap // set angle snap
arcManager.SetAngleSnap( Is45Limited() ); arcManager.SetAngleSnap( is45Limited );
// update, but don't step the manager state // update, but don't step the manager state
arcManager.AddPoint( cursorPos, false ); arcManager.AddPoint( cursorPos, false );
@ -3293,6 +3301,7 @@ int DRAWING_TOOL::DrawZone( const TOOL_EVENT& aEvent )
LSET layers( { m_frame->GetActiveLayer() } ); LSET layers( { m_frame->GetActiveLayer() } );
grid.SetSnap( !evt->Modifier( MD_SHIFT ) ); grid.SetSnap( !evt->Modifier( MD_SHIFT ) );
bool is45Limited = Is45Limited() && !evt->Modifier( MD_CTRL );
grid.SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() ); grid.SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() );
VECTOR2I cursorPos = evt->HasPosition() ? evt->Position() : m_controls->GetMousePosition(); VECTOR2I cursorPos = evt->HasPosition() ? evt->Position() : m_controls->GetMousePosition();
@ -3301,8 +3310,8 @@ int DRAWING_TOOL::DrawZone( const TOOL_EVENT& aEvent )
m_controls->ForceCursorPosition( true, cursorPos ); m_controls->ForceCursorPosition( true, cursorPos );
polyGeomMgr.SetLeaderMode( Is45Limited() ? POLYGON_GEOM_MANAGER::LEADER_MODE::DEG45 polyGeomMgr.SetLeaderMode( is45Limited ? POLYGON_GEOM_MANAGER::LEADER_MODE::DEG45
: POLYGON_GEOM_MANAGER::LEADER_MODE::DIRECT ); : POLYGON_GEOM_MANAGER::LEADER_MODE::DIRECT );
if( evt->IsCancelInteractive() ) if( evt->IsCancelInteractive() )
{ {