3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't capture Cmd+A on OSX in Canvas, it works throug the menu accelerators.

Browse Source
This commit is contained in:
bubnikv 2019-02-04 09:37:49 +01:00
parent cd838561ee
commit 7c5d94e0b1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -5102,12 +5102,15 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
// see include/wx/defs.h enum wxKeyCode // see include/wx/defs.h enum wxKeyCode
int keyCode = evt.GetKeyCode(); int keyCode = evt.GetKeyCode();
int ctrlMask = wxMOD_CONTROL; int ctrlMask = wxMOD_CONTROL;
#ifdef __APPLE__ //#ifdef __APPLE__
ctrlMask |= wxMOD_RAW_CONTROL; // ctrlMask |= wxMOD_RAW_CONTROL;
#endif /* __APPLE__ */ //#endif /* __APPLE__ */
if ((evt.GetModifiers() & ctrlMask) != 0) { if ((evt.GetModifiers() & ctrlMask) != 0) {
switch (keyCode) { switch (keyCode) {
#ifndef __APPLE__
// Even though Control+A is captured by the accelerator on OSX/wxWidgets in Slic3r, it works in text edit lines.
case WXK_CONTROL_A: post_event(SimpleEvent(EVT_GLCANVAS_SELECT_ALL)); break; case WXK_CONTROL_A: post_event(SimpleEvent(EVT_GLCANVAS_SELECT_ALL)); break;
#endif /* __APPLE__ */
#ifdef __APPLE__ #ifdef __APPLE__
case WXK_BACK: // the low cost Apple solutions are not equipped with a Delete key, use Backspace instead. case WXK_BACK: // the low cost Apple solutions are not equipped with a Delete key, use Backspace instead.
#endif /* __APPLE__ */ #endif /* __APPLE__ */