mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: button handle navigation key event 

Change-Id: I60e367a32e5b76744e81180ee5dd6c3b30fd722f
This commit is contained in:
chunmao.guo 2022-08-09 11:26:28 +08:00 committed by Lane.Wei
parent ee43edb7e6
commit a7bd14003b
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/slic3r/GUI/Widgets/Button.cpp
View File

@ -253,7 +253,12 @@ void Button::keyDownUp(wxKeyEvent &event)
GetEventHandler()->ProcessEvent(evt); GetEventHandler()->ProcessEvent(evt);
return; return;
} }
event.Skip(); if (event.GetEventType() == wxEVT_KEY_DOWN &&
(event.GetKeyCode() == WXK_TAB || event.GetKeyCode() == WXK_LEFT || event.GetKeyCode() == WXK_RIGHT
|| event.GetKeyCode() == WXK_UP || event.GetKeyCode() == WXK_DOWN))
HandleAsNavigationKey(event);
else
event.Skip();
} }
void Button::sendButtonEvent() void Button::sendButtonEvent()
@ -271,17 +276,10 @@ WXLRESULT Button::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
if (nMsg == WM_KEYDOWN) { if (nMsg == WM_KEYDOWN) {
wxKeyEvent event(CreateKeyEvent(wxEVT_KEY_DOWN, wParam, lParam)); wxKeyEvent event(CreateKeyEvent(wxEVT_KEY_DOWN, wParam, lParam));
switch (wParam) { switch (wParam) {
case WXK_RETURN: { case WXK_RETURN: { // WXK_RETURN key is handled by default button
GetEventHandler()->ProcessEvent(event); GetEventHandler()->ProcessEvent(event);
return 0; return 0;
} }
case WXK_TAB:
case WXK_LEFT:
case WXK_RIGHT:
case WXK_UP:
case WXK_DOWN:
if (HandleAsNavigationKey(event))
return 0;
} }
} }
return wxWindow::MSWWindowProc(nMsg, wParam, lParam); return wxWindow::MSWWindowProc(nMsg, wParam, lParam);