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

Leave back/forward/up nav buttons enabled so the action doesn't change. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/14783
This commit is contained in:
Jeff Young 2023-05-31 10:21:49 +01:00
parent e82e4af483
commit d827bb8a1f
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eeschema/sch_edit_frame.cpp
View File

@ -611,18 +611,6 @@ void SCH_EDIT_FRAME::setupUIConditions()
return m_toolManager->GetTool<SCH_NAVIGATE_TOOL>()->CanGoUp(); return m_toolManager->GetTool<SCH_NAVIGATE_TOOL>()->CanGoUp();
}; };
auto navHistoryHasForward =
[this]( const SELECTION& aSel )
{
return m_toolManager->GetTool<SCH_NAVIGATE_TOOL>()->CanGoForward();
};
auto navHistoryHasBackward =
[this]( const SELECTION& aSel )
{
return m_toolManager->GetTool<SCH_NAVIGATE_TOOL>()->CanGoBack();
};
auto navSchematicHasPreviousSheet = auto navSchematicHasPreviousSheet =
[this]( const SELECTION& aSel ) [this]( const SELECTION& aSel )
{ {
@ -636,9 +624,15 @@ void SCH_EDIT_FRAME::setupUIConditions()
}; };
mgr->SetConditions( EE_ACTIONS::leaveSheet, ENABLE( belowRootSheetCondition ) ); mgr->SetConditions( EE_ACTIONS::leaveSheet, ENABLE( belowRootSheetCondition ) );
/* Some of these are bound by default to arrow keys which will get a different action if we
* disable the buttons. So always leave them enabled so the action is consistent.
* https://gitlab.com/kicad/code/kicad/-/issues/14783
mgr->SetConditions( EE_ACTIONS::navigateUp, ENABLE( belowRootSheetCondition ) ); mgr->SetConditions( EE_ACTIONS::navigateUp, ENABLE( belowRootSheetCondition ) );
mgr->SetConditions( EE_ACTIONS::navigateForward, ENABLE( navHistoryHasForward ) ); mgr->SetConditions( EE_ACTIONS::navigateForward, ENABLE( navHistoryHasForward ) );
mgr->SetConditions( EE_ACTIONS::navigateBack, ENABLE( navHistoryHasBackward ) ); mgr->SetConditions( EE_ACTIONS::navigateBack, ENABLE( navHistoryHsBackward ) );
*/
mgr->SetConditions( EE_ACTIONS::navigatePrevious, ENABLE( navSchematicHasPreviousSheet ) ); mgr->SetConditions( EE_ACTIONS::navigatePrevious, ENABLE( navSchematicHasPreviousSheet ) );
mgr->SetConditions( EE_ACTIONS::navigateNext, ENABLE( navSchematicHasNextSheet ) ); mgr->SetConditions( EE_ACTIONS::navigateNext, ENABLE( navSchematicHasNextSheet ) );
mgr->SetConditions( EE_ACTIONS::remapSymbols, ENABLE( remapSymbolsCondition ) ); mgr->SetConditions( EE_ACTIONS::remapSymbols, ENABLE( remapSymbolsCondition ) );

33
eeschema/tools/sch_navigate_tool.cpp
View File

@ -47,6 +47,7 @@ void SCH_NAVIGATE_TOOL::CleanHistory()
// Search through our history, and removing any entries // Search through our history, and removing any entries
// that the no longer point to a sheet on the schematic // that the no longer point to a sheet on the schematic
auto entry = m_navHistory.begin(); auto entry = m_navHistory.begin();
while( entry != m_navHistory.end() ) while( entry != m_navHistory.end() )
{ {
if( std::find( sheets.begin(), sheets.end(), *entry ) != sheets.end() ) if( std::find( sheets.begin(), sheets.end(), *entry ) != sheets.end() )
@ -111,6 +112,10 @@ int SCH_NAVIGATE_TOOL::Forward( const TOOL_EVENT& aEvent )
m_frame->SetCurrentSheet( *m_navIndex ); m_frame->SetCurrentSheet( *m_navIndex );
m_frame->DisplayCurrentSheet(); m_frame->DisplayCurrentSheet();
} }
else
{
wxBell();
}
return 0; return 0;
} }
@ -128,6 +133,10 @@ int SCH_NAVIGATE_TOOL::Back( const TOOL_EVENT& aEvent )
m_frame->SetCurrentSheet( *m_navIndex ); m_frame->SetCurrentSheet( *m_navIndex );
m_frame->DisplayCurrentSheet(); m_frame->DisplayCurrentSheet();
} }
else
{
wxBell();
}
return 0; return 0;
} }
@ -136,8 +145,14 @@ int SCH_NAVIGATE_TOOL::Back( const TOOL_EVENT& aEvent )
int SCH_NAVIGATE_TOOL::Previous( const TOOL_EVENT& aEvent ) int SCH_NAVIGATE_TOOL::Previous( const TOOL_EVENT& aEvent )
{ {
if( CanGoPrevious() ) if( CanGoPrevious() )
changeSheet( m_frame->Schematic().GetSheets().at( {
m_frame->GetCurrentSheet().GetVirtualPageNumber() - 2 ) ); int targetSheet = m_frame->GetCurrentSheet().GetVirtualPageNumber() - 1;
changeSheet( m_frame->Schematic().GetSheets().at( targetSheet - 1 ) );
}
else
{
wxBell();
}
return 0; return 0;
} }
@ -146,8 +161,14 @@ int SCH_NAVIGATE_TOOL::Previous( const TOOL_EVENT& aEvent )
int SCH_NAVIGATE_TOOL::Next( const TOOL_EVENT& aEvent ) int SCH_NAVIGATE_TOOL::Next( const TOOL_EVENT& aEvent )
{ {
if( CanGoNext() ) if( CanGoNext() )
changeSheet( m_frame->Schematic().GetSheets().at( {
m_frame->GetCurrentSheet().GetVirtualPageNumber() ) ); int targetSheet = m_frame->GetCurrentSheet().GetVirtualPageNumber() + 1;
changeSheet( m_frame->Schematic().GetSheets().at( targetSheet - 1 ) );
}
else
{
wxBell();
}
return 0; return 0;
} }
@ -221,6 +242,10 @@ int SCH_NAVIGATE_TOOL::LeaveSheet( const TOOL_EVENT& aEvent )
changeSheet( popped ); changeSheet( popped );
} }
else
{
wxBell();
}
return 0; return 0;
} }