From 24efca1db189dbbf51c2cc92dffc0bb28917990f Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sun, 3 Aug 2025 23:16:39 +0100 Subject: [PATCH] Focus second column control after property grid navigation. Fixes https://gitlab.com/kicad/code/kicad/-/issues/20651 (cherry picked from commit 95da436ddda235acb3abc2ed5abf669e9e275a54) --- common/widgets/properties_panel.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/common/widgets/properties_panel.cpp b/common/widgets/properties_panel.cpp index 1fbe7e9c5c..defb084786 100644 --- a/common/widgets/properties_panel.cpp +++ b/common/widgets/properties_panel.cpp @@ -494,10 +494,15 @@ void PROPERTIES_PANEL::onCharHook( wxKeyEvent& aEvent ) } } - if( aEvent.GetKeyCode() == WXK_RETURN || aEvent.GetKeyCode() == WXK_NUMPAD_ENTER ) + if( aEvent.GetKeyCode() == WXK_RETURN || aEvent.GetKeyCode() == WXK_NUMPAD_ENTER + || aEvent.GetKeyCode() == WXK_DOWN || aEvent.GetKeyCode() == WXK_UP ) { m_grid->CommitChangesFromEditor(); - /* don't skip this one; if we're not the last property we'll also go to the next row */ + + CallAfter( [this]() + { + m_grid->SelectProperty( m_grid->GetSelectedProperty(), true ); + } ); } aEvent.Skip();