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

Don't run the hotkey if the action isn't enabled 

CHANGED: Don't run the hotkey if the action's UI elements aren't enabled

This makes it so the action can't be run from either the hotkey or the
UI if its enabling conditions are not met.
This commit is contained in:
Ian McInerney 2020-08-14 02:33:25 +01:00
parent 4491f24d5e
commit dbe5537fa9
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
common/tool/action_manager.cpp
View File

@ -74,6 +74,10 @@ void ACTION_MANAGER::SetConditions( const TOOL_ACTION& aAction, const ACTION_CON
m_uiConditions[aAction.GetId()] = aConditions;
wxLogTrace( kicadTraceToolStack,
"ACTION_MANAGER::SetConditions: Registering conditions for ID %d - %s",
aAction.GetId(), aAction.GetName() );
// Register a new handler with the new conditions
if( m_toolMgr )
m_toolMgr->GetToolHolder()->RegisterUIUpdateHandler( aAction, aConditions );
@ -82,7 +86,7 @@ void ACTION_MANAGER::SetConditions( const TOOL_ACTION& aAction, const ACTION_CON
const ACTION_CONDITIONS* ACTION_MANAGER::GetCondition( const TOOL_ACTION& aAction ) const
{
const auto it = m_uiConditions.find( aAction.GetUIId() );
const auto it = m_uiConditions.find( aAction.GetId() );
// If the action doesn't have something registered, then return null
if( it == m_uiConditions.end() )
@ -174,25 +178,41 @@ bool ACTION_MANAGER::RunHotKey( int aHotKey ) const
}
}
// Get the selection to use to test if the action is enabled
SELECTION& sel = m_toolMgr->GetToolHolder()->GetCurrentSelection();
if( context )
{
bool runAction = true;
if( const ACTION_CONDITIONS* aCond = GetCondition( *context ) )
runAction = aCond->enableCondition( sel );
wxLogTrace( kicadTraceToolStack,
"ACTION_MANAGER::RunHotKey Running context action %s for hotkey %s",
"ACTION_MANAGER::RunHotKey %s context action: %s for hotkey %s",
runAction ? "Running" : "Not running",
context->GetName(),
KeyNameFromKeyCode( aHotKey ) );
return m_toolMgr->RunAction( *context, true );
if( runAction )
return m_toolMgr->RunAction( *context, true );
}
else if( !global.empty() )
{
for( auto act : global )
{
bool runAction = true;
if( const ACTION_CONDITIONS* aCond = GetCondition( *act ) )
runAction = aCond->enableCondition( sel );
wxLogTrace( kicadTraceToolStack,
"ACTION_MANAGER::RunHotKey Running global action: %s for hotkey %s",
"ACTION_MANAGER::RunHotKey %s global action: %s for hotkey %s",
runAction ? "Running" : "Not running",
act->GetName(),
KeyNameFromKeyCode( aHotKey ) );
if( m_toolMgr->RunAction( *act, true ) )
if( runAction && m_toolMgr->RunAction( *act, true ) )
return true;
}
}