From f856129e72d1f01fedcfdb8ab7354b69e50dc0be Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Fri, 12 May 2023 13:54:37 +0200 Subject: [PATCH] Follow-up of bbea397aa662a01e8b42ea13159aa4109a615573 - Alternate fix for SPE-1675 --- src/slic3r/GUI/GLCanvas3D.cpp | 5 +++++ src/slic3r/GUI/GLCanvas3D.hpp | 1 + 2 files changed, 6 insertions(+) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index fc2e04d5a..c90eae5d3 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -3509,6 +3509,9 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) else if (evt.Leaving()) { _deactivate_undo_redo_toolbar_items(); + if (m_layers_editing.state != LayersEditing::Unknown) + m_layers_editing.state = LayersEditing::Paused; + // to remove hover on objects when the mouse goes out of this canvas m_mouse.position = Vec2d(-1.0, -1.0); m_dirty = true; @@ -6556,7 +6559,9 @@ void GLCanvas3D::_perform_layer_editing_action(wxMouseEvent* evt) m_layers_editing.last_action = evt->ShiftDown() ? (evt->RightIsDown() ? LAYER_HEIGHT_EDIT_ACTION_SMOOTH : LAYER_HEIGHT_EDIT_ACTION_REDUCE) : (evt->RightIsDown() ? LAYER_HEIGHT_EDIT_ACTION_INCREASE : LAYER_HEIGHT_EDIT_ACTION_DECREASE); + } + if (m_layers_editing.state != LayersEditing::Paused) { m_layers_editing.adjust_layer_height_profile(); _refresh_if_shown_on_screen(); } diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index 38dcdb8b8..b9677fda6 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -193,6 +193,7 @@ class GLCanvas3D Unknown, Editing, Completed, + Paused, Num_States };