From 24a8f832bc093a86095d8eb3036e900fba67813b Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Tue, 1 Dec 2020 10:43:04 +0100 Subject: [PATCH] Fixed activation of shortcut dialog with '?' key --- src/slic3r/GUI/GLCanvas3D.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index f4e94fb89..c1ae73776 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -2413,10 +2413,15 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) post_event(SimpleEvent(EVT_GLCANVAS_ARRANGE)); }; + auto action_question_mark = [this]() { + post_event(SimpleEvent(EVT_GLCANVAS_QUESTION_MARK)); + }; + //#ifdef __APPLE__ // ctrlMask |= wxMOD_RAW_CONTROL; //#endif /* __APPLE__ */ if ((evt.GetModifiers() & ctrlMask) != 0) { + // CTRL is pressed switch (keyCode) { #ifdef __APPLE__ case 'a': @@ -2504,7 +2509,8 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) default: evt.Skip(); } } - else if ((evt.GetModifiers() & shiftMask) != 0) { + else if ((evt.GetModifiers() & shiftMask) != 0) { + // SHIFT is pressed switch (keyCode) { case '+': { action_plus(evt); break; } case 'A': @@ -2515,6 +2521,7 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) post_event(wxKeyEvent(EVT_GLCANVAS_JUMP_TO, evt)); break; } + case '?': { action_question_mark(); break; } default: evt.Skip(); } @@ -2543,7 +2550,7 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) else post_event(Event(EVT_GLCANVAS_INCREASE_INSTANCES, -1)); break; } - case '?': { post_event(SimpleEvent(EVT_GLCANVAS_QUESTION_MARK)); break; } + case '?': { action_question_mark(); break; } case 'A': case 'a': { action_a(); break; } case 'B':