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

Enable lock menu for all selections. 

It doesn't pay to try and be too smart as it just confuses people.
When the bugs come in that it doesn't dim I'll just be marking them
as "as designed". :)

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

28
pcbnew/tools/pcb_editor_control.cpp
View File

@ -125,7 +125,7 @@ PCB_EDITOR_CONTROL::PCB_EDITOR_CONTROL() :
m_frame( nullptr )
{
m_placeOrigin = std::make_unique<KIGFX::ORIGIN_VIEWITEM>( KIGFX::COLOR4D( 0.8, 0.0, 0.0, 1.0 ),
KIGFX::ORIGIN_VIEWITEM::CIRCLE_CROSS );
KIGFX::ORIGIN_VIEWITEM::CIRCLE_CROSS );
}
@ -149,17 +149,23 @@ void PCB_EDITOR_CONTROL::Reset( RESET_REASON aReason )
bool PCB_EDITOR_CONTROL::Init()
{
auto activeToolCondition = [ this ] ( const SELECTION& aSel ) {
return ( !m_frame->ToolStackIsEmpty() );
};
auto activeToolCondition =
[ this ] ( const SELECTION& aSel )
{
return ( !m_frame->ToolStackIsEmpty() );
};
auto inactiveStateCondition = [ this ] ( const SELECTION& aSel ) {
return ( m_frame->ToolStackIsEmpty() && aSel.Size() == 0 );
};
auto inactiveStateCondition =
[ this ] ( const SELECTION& aSel )
{
return ( m_frame->ToolStackIsEmpty() && aSel.Size() == 0 );
};
auto placeModuleCondition = [ this ] ( const SELECTION& aSel ) {
return ( m_frame->IsCurrentTool( PCB_ACTIONS::placeModule ) && aSel.GetSize() == 0 );
};
auto placeModuleCondition =
[ this ] ( const SELECTION& aSel )
{
return m_frame->IsCurrentTool( PCB_ACTIONS::placeModule ) && aSel.GetSize() == 0;
};
auto& ctxMenu = m_menu.GetMenu();
@ -196,7 +202,7 @@ bool PCB_EDITOR_CONTROL::Init()
toolMenu.AddSubMenu( zoneMenu );
toolMenu.AddSubMenu( lockMenu );
menu.AddMenu( lockMenu.get(), SELECTION_CONDITIONS::OnlyTypes( GENERAL_COLLECTOR::LockableItems ), 100 );
menu.AddMenu( lockMenu.get(), SELECTION_CONDITIONS::NotEmpty, 100 );
menu.AddMenu( zoneMenu.get(), SELECTION_CONDITIONS::OnlyType( PCB_ZONE_T ), 200 );
}