open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(modulo): fix search bar shortcut handling for non-querty layouts. Fix #823

Browse Source
This commit is contained in:
Federico Terzi 2021-10-31 20:21:04 +01:00
parent 4ca35ea14d
commit 1bad4b2bfb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
espanso-modulo/src/sys/search/search.cpp
View File

@ -236,6 +236,7 @@ SearchFrame::SearchFrame(const wxString &title, const wxPoint &pos, const wxSize
vbox->Add(resultBox, 5, wxEXPAND | wxALL, 0); vbox->Add(resultBox, 5, wxEXPAND | wxALL, 0);
Bind(wxEVT_CHAR_HOOK, &SearchFrame::OnCharEvent, this, wxID_ANY); Bind(wxEVT_CHAR_HOOK, &SearchFrame::OnCharEvent, this, wxID_ANY);
searchBar->Bind(wxEVT_CHAR, &SearchFrame::OnCharEvent, this, wxID_ANY);
Bind(wxEVT_TEXT, &SearchFrame::OnQueryChange, this, textId); Bind(wxEVT_TEXT, &SearchFrame::OnQueryChange, this, textId);
Bind(wxEVT_LISTBOX_DCLICK, &SearchFrame::OnItemClickEvent, this, resultId); Bind(wxEVT_LISTBOX_DCLICK, &SearchFrame::OnItemClickEvent, this, resultId);
Bind(wxEVT_ACTIVATE, &SearchFrame::OnActivate, this, wxID_ANY); Bind(wxEVT_ACTIVATE, &SearchFrame::OnActivate, this, wxID_ANY);
@ -276,9 +277,9 @@ void SearchFrame::OnCharEvent(wxKeyEvent &event)
SelectNext(); SelectNext();
} }
} }
else if (event.GetKeyCode() >= 49 && event.GetKeyCode() <= 56) else if (event.GetUnicodeKey() >= '1' && event.GetUnicodeKey() <= '9')
{ // Alt + num shortcut { // Alt + num shortcut
int index = event.GetKeyCode() - 49; int index = event.GetUnicodeKey() - '1';
if (wxGetKeyState(WXK_ALT)) if (wxGetKeyState(WXK_ALT))
{ {
if (resultBox->GetItemCount() > index) if (resultBox->GetItemCount() > index)