diff options
| author | enricoturri1966 <enricoturri@seznam.cz> | 2020-12-01 12:43:32 +0300 |
|---|---|---|
| committer | enricoturri1966 <enricoturri@seznam.cz> | 2020-12-01 12:43:32 +0300 |
| commit | 42a00a32dfbd58cb07c672f8c39d644fc6949b44 (patch) | |
| tree | 76378f37ffce415fc427a3f82828f138612defea /src | |
| parent | e842077cc6070017640a2502be4caa945f4ea370 (diff) | |
| parent | 24a8f832bc093a86095d8eb3036e900fba67813b (diff) | |
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_animations
Diffstat (limited to 'src')
| -rw-r--r-- | src/slic3r/GUI/GLCanvas3D.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index f5adbf404..e2d3a9585 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -2412,10 +2412,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': @@ -2503,7 +2508,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': @@ -2514,6 +2520,7 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) post_event(wxKeyEvent(EVT_GLCANVAS_JUMP_TO, evt)); break; } + case '?': { action_question_mark(); break; } default: evt.Skip(); } @@ -2542,7 +2549,7 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) else post_event(Event<int>(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': |