From 4b68fbd973069ca87d7aa5bd8881eb7f31c222d4 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Thu, 27 Apr 2023 15:55:07 +0200 Subject: [PATCH] Follow-up https://github.com/Prusa-Development/PrusaSlicerPrivate/commit/88f4fa20df3e73b962b7800cc709b0ed43113338 - Fixed next Linux specific issue : Select any instance in place where is active a gizmo space on instance --- src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp | 18 ++---------------- src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp | 1 - 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp index 98058ee17..d10c7a5ff 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp @@ -24,14 +24,8 @@ GLGizmoFlatten::GLGizmoFlatten(GLCanvas3D& parent, const std::string& icon_filen bool GLGizmoFlatten::on_mouse(const wxMouseEvent &mouse_event) { - if (mouse_event.Moving()) { - // only for sure - m_mouse_left_down = false; - return false; - } if (mouse_event.LeftDown()) { if (m_hover_id != -1) { - m_mouse_left_down = true; Selection &selection = m_parent.get_selection(); if (selection.is_single_full_instance()) { // Rotate the object so the normal points downward: @@ -42,16 +36,8 @@ bool GLGizmoFlatten::on_mouse(const wxMouseEvent &mouse_event) return true; } } - else if (mouse_event.LeftUp()) { - if (m_mouse_left_down) { - // responsible for mouse left up after selecting plane - m_mouse_left_down = false; - return true; - } - - } - else if (mouse_event.Leaving()) - m_mouse_left_down = false; + else if (mouse_event.LeftUp()) + return m_hover_id != -1; return false; } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp index ff44fcd2d..e9e3c08d0 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp @@ -37,7 +37,6 @@ private: std::vector m_planes; std::vector> m_planes_casters; - bool m_mouse_left_down = false; // for detection left_up of this gizmo const ModelObject* m_old_model_object = nullptr; int m_old_instance_id{ -1 };