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

Move Enter Group for easier access.

This commit is contained in:
Alex 2022-10-07 01:52:59 +03:00
parent b4c18dd22a
commit 22917860ef
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcbnew/board.cpp
View File

@ -2130,7 +2130,6 @@ BOARD::GroupLegalOpsField BOARD::GroupLegalOps( const PCB_SELECTION& selection )
legalOps.create = true; legalOps.create = true;
legalOps.removeItems = hasMember; legalOps.removeItems = hasMember;
legalOps.ungroup = hasGroup; legalOps.ungroup = hasGroup;
legalOps.enter = hasGroup && selection.Size() == 1;
return legalOps; return legalOps;
} }

1
pcbnew/board.h
View File

@ -1119,7 +1119,6 @@ public:
bool create : 1; bool create : 1;
bool ungroup : 1; bool ungroup : 1;
bool removeItems : 1; bool removeItems : 1;
bool enter : 1;
}; };
/** /**

4
pcbnew/tools/group_tool.cpp
View File

@ -45,7 +45,6 @@ public:
Add( PCB_ACTIONS::group ); Add( PCB_ACTIONS::group );
Add( PCB_ACTIONS::ungroup ); Add( PCB_ACTIONS::ungroup );
Add( PCB_ACTIONS::removeFromGroup ); Add( PCB_ACTIONS::removeFromGroup );
Add( PCB_ACTIONS::groupEnter );
} }
ACTION_MENU* create() const override ACTION_MENU* create() const override
@ -69,7 +68,6 @@ private:
Enable( PCB_ACTIONS::group.GetUIId(), legalOps.create ); Enable( PCB_ACTIONS::group.GetUIId(), legalOps.create );
Enable( PCB_ACTIONS::ungroup.GetUIId(), legalOps.ungroup ); Enable( PCB_ACTIONS::ungroup.GetUIId(), legalOps.ungroup );
Enable( PCB_ACTIONS::removeFromGroup.GetUIId(), legalOps.removeItems ); Enable( PCB_ACTIONS::removeFromGroup.GetUIId(), legalOps.removeItems );
Enable( PCB_ACTIONS::groupEnter.GetUIId(), legalOps.enter );
} }
}; };
@ -207,7 +205,7 @@ int GROUP_TOOL::PickNewMember( const TOOL_EVENT& aEvent )
} }
canvas()->SetStatusPopup( nullptr ); canvas()->SetStatusPopup( nullptr );
return 0; return 0;
} }

4
pcbnew/tools/pcb_selection_tool.cpp
View File

@ -173,6 +173,9 @@ bool PCB_SELECTION_TOOL::Init()
return !cfg->GetHighlightNetCodes().empty(); return !cfg->GetHighlightNetCodes().empty();
}; };
auto groupEnterCondition =
SELECTION_CONDITIONS::Count( 1 ) && SELECTION_CONDITIONS::HasType( PCB_GROUP_T );
auto inGroupCondition = auto inGroupCondition =
[this] ( const SELECTION& ) [this] ( const SELECTION& )
{ {
@ -187,6 +190,7 @@ bool PCB_SELECTION_TOOL::Init()
// "Cancel" goes at the top of the context menu when a tool is active // "Cancel" goes at the top of the context menu when a tool is active
menu.AddItem( ACTIONS::cancelInteractive, activeToolCondition, 1 ); menu.AddItem( ACTIONS::cancelInteractive, activeToolCondition, 1 );
menu.AddItem( PCB_ACTIONS::groupEnter, groupEnterCondition, 1 );
menu.AddItem( PCB_ACTIONS::groupLeave, inGroupCondition, 1 ); menu.AddItem( PCB_ACTIONS::groupLeave, inGroupCondition, 1 );
menu.AddItem( PCB_ACTIONS::clearHighlight, haveHighlight, 1 ); menu.AddItem( PCB_ACTIONS::clearHighlight, haveHighlight, 1 );