From 368badd225d6b09dc4654cbfac29290acd3b6bc8 Mon Sep 17 00:00:00 2001 From: "yifan.wu" Date: Sun, 16 Oct 2022 20:38:33 +0800 Subject: [PATCH] ENH: delete objects/parts by back key on macOS Signed-off-by: yifan.wu Change-Id: I4fb5a940955a3f165fe61b7499509c5c72c53460 --- src/slic3r/GUI/GLCanvas3D.cpp | 4 ++++ src/slic3r/GUI/GUI_ObjectList.cpp | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 969f370c1c..145b0a9f18 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -2410,6 +2410,10 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) { //case WXK_BACK: case WXK_DELETE: { post_event(SimpleEvent(EVT_GLTOOLBAR_DELETE)); break; } + // BBS +#ifdef __APPLE__ + case WXK_BACK: { post_event(SimpleEvent(EVT_GLTOOLBAR_DELETE)); break; } +#endif case WXK_ESCAPE: { deselect_all(); break; } //case WXK_F5: { // if ((wxGetApp().is_editor() && !wxGetApp().plater()->model().objects.empty()) || diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index c61ae04822..fffe2a805c 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -181,8 +181,7 @@ ObjectList::ObjectList(wxWindow* parent) : entries[index++].Set(wxACCEL_CTRL, (int)'A', wxID_SELECTALL); entries[index++].Set(wxACCEL_CTRL, (int)'Z', wxID_UNDO); entries[index++].Set(wxACCEL_CTRL, (int)'Y', wxID_REDO); - entries[index++].Set(wxACCEL_NORMAL, WXK_DELETE, wxID_DELETE); - //entries[index++].Set(wxACCEL_NORMAL, WXK_BACK, wxID_DELETE); + entries[index++].Set(wxACCEL_NORMAL, WXK_BACK, wxID_DELETE); //entries[index++].Set(wxACCEL_NORMAL, int('+'), wxID_ADD); //entries[index++].Set(wxACCEL_NORMAL, WXK_NUMPAD_ADD, wxID_ADD); //entries[index++].Set(wxACCEL_NORMAL, int('-'), wxID_REMOVE);