From 433a4b2a7fa2713d0a4bb02ef168ff040183d52d Mon Sep 17 00:00:00 2001 From: "liz.li" Date: Wed, 8 Nov 2023 15:07:01 +0800 Subject: [PATCH] FIX: clone shortcut key conflict with quit in macos jira: STUDIO-5166 Change-Id: I548f275bb68d3b0e6bb3cfad6fe93df09d507da3 --- src/slic3r/GUI/GLCanvas3D.cpp | 2 +- src/slic3r/GUI/GUI_Factories.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 3935681c3..8d151561a 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -3097,7 +3097,7 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) #endif /* __APPLE__ */ post_event(SimpleEvent(EVT_GLTOOLBAR_DELETE_ALL)); break; - case WXK_CONTROL_Q: + case WXK_CONTROL_K: post_event(SimpleEvent(EVT_GLTOOLBAR_CLONE)); break; default: evt.Skip(); diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index 0f2991365..7a8fcdf4b 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -1465,7 +1465,7 @@ void MenuFactory::append_menu_item_clone(wxMenu* menu) #else static const wxString ctrl = _L("Ctrl+"); #endif - append_menu_item(menu, wxID_ANY, _L("Clone") + "\t" + ctrl + "Q", "", + append_menu_item(menu, wxID_ANY, _L("Clone") + "\t" + ctrl + "K", "", [this](wxCommandEvent&) { plater()->clone_selection(); }, "", nullptr,