From 081a24abf39cc5b1f911c797370566d2b609caa5 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Tue, 31 Mar 2020 15:30:24 +0200 Subject: [PATCH] Follow-up of 095062e371115c864f7884da2ee927f43ee723f3 -> 3DConnexion settings dialog (Ctrl+M) shown only on Linux (not Mac) --- src/slic3r/GUI/GLCanvas3D.cpp | 7 +++---- src/slic3r/GUI/KBShortcutsDialog.cpp | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 6d9c6eb24..94489d0d3 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -3013,16 +3013,15 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) post_event(SimpleEvent(EVT_GLTOOLBAR_COPY)); break; -#ifdef __APPLE__ - case 'm': - case 'M': +#ifdef __linux__ + case WXK_CONTROL_M: { Mouse3DController& controller = wxGetApp().plater()->get_mouse3d_controller(); controller.show_settings_dialog(!controller.is_settings_dialog_shown()); m_dirty = true; break; } -#endif /* __APPLE__ */ +#endif /* __linux__ */ #ifdef __APPLE__ case 'v': diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index d8a079232..79a6cad20 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -185,9 +185,9 @@ void KBShortcutsDialog::fill_shortcuts() { "Z", L("Zoom to selected object\nor all objects in scene, if none selected") }, { "I", L("Zoom in") }, { "O", L("Zoom out") }, -#ifdef __APPLE__ +#ifdef __linux__ { ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") }, -#endif // __APPLE__ +#endif // __linux__ #if ENABLE_RENDER_PICKING_PASS // Don't localize debugging texts. { "T", "Toggle picking pass texture rendering on/off" },