From 98dc111d715df14d9f85cbad29caff2d19535d9f Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 20 May 2024 10:26:13 +0800 Subject: [PATCH] NEW:add tab key to change 3D to preview jira:none code is from OrcaSlicer,thanks for OrcaSlicer and SoftFever commit 2a478ab4f9bdc1bc1fbc9dfadbb717df6e5a38a9 Author: SoftFever Date: Sat Aug 26 18:24:13 2023 +0800 post changes after merging BS1.7.4 Change-Id: Iec176023f6f8e4b93a3756a78e31f85b249d1dfa --- src/slic3r/GUI/GLCanvas3D.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 003822814..8ad800658 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -3493,7 +3493,7 @@ void GLCanvas3D::on_key(wxKeyEvent& evt) else if (m_tab_down && keyCode == WXK_TAB && !evt.HasAnyModifiers()) { // Enable switching between 3D and Preview with Tab // m_canvas->HandleAsNavigationKey(evt); // XXX: Doesn't work in some cases / on Linux - //post_event(SimpleEvent(EVT_GLCANVAS_TAB)); + post_event(SimpleEvent(EVT_GLCANVAS_TAB)); } else if (keyCode == WXK_SHIFT) { translationProcessor.process(evt); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index f5afe5bf3..96b4e367b 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3340,11 +3340,11 @@ void Plater::priv::select_view_3D(const std::string& name, bool no_slice) void Plater::priv::select_next_view_3D() { if (current_panel == view3D) - set_current_panel(preview); + wxGetApp().mainframe->select_tab(size_t(MainFrame::tpPreview)); else if (current_panel == preview) - set_current_panel(assemble_view); - else if (current_panel == assemble_view) - set_current_panel(view3D); + wxGetApp().mainframe->select_tab(size_t(MainFrame::tp3DEditor)); + //else if (current_panel == assemble_view) + // set_current_panel(view3D); } void Plater::priv::collapse_sidebar(bool collapse)