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

Change lock toggle to put selection in uniform state. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6367
This commit is contained in:
Jeff Young 2020-12-09 22:09:34 +00:00
parent 65782d5c5a
commit df4f4560be
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pcbnew/tools/pcb_editor_control.cpp
View File

@ -977,36 +977,46 @@ int PCB_EDITOR_CONTROL::modifyLockSelected( MODIFY_MODE aMode )
if( selection.Empty() )
m_toolMgr->RunAction( PCB_ACTIONS::selectionCursor, true );
// Resolve TOGGLE mode
if( aMode == TOGGLE )
{
aMode = ON;
for( EDA_ITEM* item : selection )
{
BOARD_ITEM* board_item = static_cast<BOARD_ITEM*>( item );
if( board_item->IsLocked() )
{
aMode = OFF;
break;
}
}
}
bool modified = false;
for( EDA_ITEM* item : selection )
{
BOARD_ITEM* board_item = static_cast<BOARD_ITEM*>( item );
bool prevState = board_item->IsLocked();
commit.Modify( board_item );
switch( aMode )
if( aMode == ON )
{
case ON: board_item->SetLocked( true ); break;
case OFF: board_item->SetLocked( false ); break;
case TOGGLE: board_item->SetLocked( !prevState ); break;
modified |= !board_item->IsLocked();
board_item->SetLocked( true );
}
else
{
modified |= board_item->IsLocked();
board_item->SetLocked( false );
}
// Check if we really modified an item
if( !modified && prevState != board_item->IsLocked() )
modified = true;
}
if( modified )
{
switch( aMode )
{
case ON: commit.Push( _( "Lock" ) ); break;
case OFF: commit.Push( _( "Unlock" ) ); break;
case TOGGLE: commit.Push( _( "Toggle Locking" ) ); break;
}
commit.Push( aMode == ON ? _( "Lock" ) : _( "Unock" ) );
m_toolMgr->PostEvent( EVENTS::SelectedItemsModified );
m_frame->OnModify();
}