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

Re-enter auto-complete on a ctrl-space. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16445
This commit is contained in:
Jeff Young 2023-12-27 21:14:04 +00:00
parent d7fe668d79
commit e17d81cf6d
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/scintilla_tricks.cpp
View File

@ -225,6 +225,22 @@ void SCINTILLA_TRICKS::onCharHook( wxKeyEvent& aEvent )
return;
}
#ifdef __WXMAC__
if( aEvent.GetModifiers() == wxMOD_RAW_CONTROL && aEvent.GetKeyCode() == WXK_SPACE )
#else
if( aEvent.GetModifiers() == wxMOD_CONTROL && aEvent.GetKeyCode() == WXK_SPACE )
#endif
{
m_suppressAutocomplete = false;
wxStyledTextEvent event;
event.SetKey( ' ' );
event.SetModifiers( wxMOD_CONTROL );
m_onCharAddedHandler( event );
return;
}
if( !isalpha( aEvent.GetKeyCode() ) )
m_suppressAutocomplete = false;

19
pcbnew/dialogs/panel_setup_rules.cpp
View File

@ -52,6 +52,10 @@ PANEL_SETUP_RULES::PANEL_SETUP_RULES( wxWindow* aParentWindow, PCB_EDIT_FRAME* a
{
wxPostEvent( PAGED_DIALOG::GetDialog( this ),
wxCommandEvent( wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK ) );
},
[this]( wxStyledTextEvent& aEvent )
{
onScintillaCharAdded( aEvent );
} );
m_textEditor->AutoCompSetSeparator( '|' );
@ -71,17 +75,12 @@ PANEL_SETUP_RULES::PANEL_SETUP_RULES( wxWindow* aParentWindow, PCB_EDIT_FRAME* a
m_textEditor->SetZoom( Pgm().GetCommonSettings()->m_Appearance.text_editor_zoom );
m_textEditor->UsePopUp( 0 );
m_textEditor->Bind( wxEVT_STC_CHARADDED, &PANEL_SETUP_RULES::onScintillaCharAdded, this );
m_textEditor->Bind( wxEVT_STC_AUTOCOMP_CHAR_DELETED, &PANEL_SETUP_RULES::onScintillaCharAdded, this );
m_textEditor->Bind( wxEVT_CHAR_HOOK, &PANEL_SETUP_RULES::onCharHook, this );
}
PANEL_SETUP_RULES::~PANEL_SETUP_RULES( )
{
m_textEditor->Unbind( wxEVT_STC_CHARADDED, &PANEL_SETUP_RULES::onScintillaCharAdded, this );
m_textEditor->Unbind( wxEVT_STC_AUTOCOMP_CHAR_DELETED, &PANEL_SETUP_RULES::onScintillaCharAdded,
this );
m_textEditor->Unbind( wxEVT_CHAR_HOOK, &PANEL_SETUP_RULES::onCharHook, this );
Pgm().GetCommonSettings()->m_Appearance.text_editor_zoom = m_textEditor->GetZoom();
@ -181,7 +180,15 @@ void PANEL_SETUP_RULES::OnContextMenu(wxMouseEvent &event)
void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
{
PAGED_DIALOG::GetDialog( this )->SetModified();
if( aEvent.GetModifiers() == wxMOD_CONTROL && aEvent.GetKey() == ' ' )
{
// This is just a short-cut for do-auto-complete
}
else
{
PAGED_DIALOG::GetDialog( this )->SetModified();
}
m_textEditor->SearchAnchor();
wxString rules = m_textEditor->GetText();