From a830b7ea834e0f0ed6584fa6a62c32007d1d3e3b Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Mon, 26 Oct 2020 11:35:53 +0100 Subject: [PATCH] Setting dialog for 3DConnexion device (CTRL+M) enabled on MAC --- src/slic3r/GUI/GLCanvas3D.cpp | 2 +- src/slic3r/GUI/KBShortcutsDialog.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 179a82c8a..ff53ce7e6 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -2934,7 +2934,7 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) post_event(SimpleEvent(EVT_GLTOOLBAR_COPY)); break; -#ifdef __linux__ +#if defined(__linux__) || defined(__APPLE__) case WXK_CONTROL_M: { Mouse3DController& controller = wxGetApp().plater()->get_mouse3d_controller(); diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index 7c7069315..1d19c7b2b 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -178,7 +178,7 @@ void KBShortcutsDialog::fill_shortcuts() { "O", L("Zoom out") }, { "Tab", L("Switch between Editor/Preview") }, { "Shift+Tab", L("Collapse/Expand the sidebar") }, -#ifdef __linux__ +#if defined(__linux__) || defined(__APPLE__) { ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") }, #endif // __linux__ #if ENABLE_RENDER_PICKING_PASS