From c300b66b7e7cba87e24c17531c83f4babe91c6c5 Mon Sep 17 00:00:00 2001 From: enricoturri1966 <enricoturri@seznam.cz> Date: Wed, 25 Mar 2020 09:05:35 +0100 Subject: [PATCH] ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI --- src/libslic3r/Technologies.hpp | 2 -- src/slic3r/GUI/Gizmos/GLGizmosManager.cpp | 16 ++++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index 1be5f50bf..f5021bdfb 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -68,8 +68,6 @@ // Enable tooltips for GLCanvas3D using ImGUI #define ENABLE_CANVAS_TOOLTIP_USING_IMGUI (1 && ENABLE_2_2_0_FINAL) -// Enable modified mouse events handling for gizmobar -#define ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING (1 && ENABLE_CANVAS_TOOLTIP_USING_IMGUI) // Enable fix for dragging mouse event handling for gizmobar #define ENABLE_GIZMO_TOOLBAR_DRAGGING_FIX (1 && ENABLE_2_2_0_FINAL) diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index 3df079a4d..200ac0f81 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -456,7 +456,7 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt) int selected_object_idx = selection.get_object_idx(); bool processed = false; -#if !ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING +#if !ENABLE_CANVAS_TOOLTIP_USING_IMGUI // mouse anywhere if (!evt.Dragging() && !evt.Leaving() && !evt.Entering() && (m_mouse_capture.parent != nullptr)) { @@ -466,12 +466,12 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt) m_mouse_capture.reset(); } -#endif // !ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING +#endif // !ENABLE_CANVAS_TOOLTIP_USING_IMGUI // mouse anywhere if (evt.Moving()) m_tooltip = update_hover_state(mouse_pos); -#if ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING +#if ENABLE_CANVAS_TOOLTIP_USING_IMGUI else if (evt.LeftUp()) { if (m_mouse_capture.left) @@ -557,7 +557,7 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt) else if (evt.Dragging() && m_mouse_capture.any()) // if the button down was done on this toolbar, prevent from dragging into the scene processed = true; -#endif // ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING +#endif // ENABLE_CANVAS_TOOLTIP_USING_IMGUI #if ENABLE_GIZMO_TOOLBAR_DRAGGING_FIX else if (evt.Dragging() && is_dragging()) { @@ -696,7 +696,7 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt) processed = true; } #endif // !ENABLE_GIZMO_TOOLBAR_DRAGGING_FIX -#if !ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING +#if !ENABLE_CANVAS_TOOLTIP_USING_IMGUI else if (evt.LeftUp() && is_dragging()) { switch (m_current) { @@ -718,7 +718,7 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt) processed = true; } -#endif // !ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING +#endif // !ENABLE_CANVAS_TOOLTIP_USING_IMGUI else if (evt.LeftUp() && (m_current == SlaSupports || m_current == Hollow) && !m_parent.is_mouse_dragging()) { // in case SLA gizmo is selected, we just pass the LeftUp event and stop processing - neither @@ -757,10 +757,10 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt) m_mouse_capture.right = true; m_mouse_capture.parent = &m_parent; } -#if !ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING +#if !ENABLE_CANVAS_TOOLTIP_USING_IMGUI else if (evt.LeftUp()) processed = true; -#endif // !ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING +#endif // !ENABLE_CANVAS_TOOLTIP_USING_IMGUI } return processed;