From 69ca14a695908f91634e2151ed2751fa2bc76d7d Mon Sep 17 00:00:00 2001
From: enricoturri1966 <enricoturri@seznam.cz>
Date: Wed, 25 Mar 2020 08:52:57 +0100
Subject: [PATCH] ENABLE_MODIFIED_TOOLBAR_MOUSE_EVENT_HANDLING merged into
 ENABLE_CANVAS_TOOLTIP_USING_IMGUI

---
 src/libslic3r/Technologies.hpp | 2 --
 src/slic3r/GUI/GLToolbar.cpp   | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp
index aedd2adddd..1be5f50bfa 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 toolbars
-#define ENABLE_MODIFIED_TOOLBAR_MOUSE_EVENT_HANDLING (1 && ENABLE_CANVAS_TOOLTIP_USING_IMGUI)
 // 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
diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp
index 8b84d38752..9391aa7450 100644
--- a/src/slic3r/GUI/GLToolbar.cpp
+++ b/src/slic3r/GUI/GLToolbar.cpp
@@ -454,7 +454,7 @@ bool GLToolbar::on_mouse(wxMouseEvent& evt, GLCanvas3D& parent)
         m_mouse_capture.reset();
     }
 
-#if ENABLE_MODIFIED_TOOLBAR_MOUSE_EVENT_HANDLING
+#if ENABLE_CANVAS_TOOLTIP_USING_IMGUI
     if (evt.Moving())
         update_hover_state(mouse_pos, parent);
     else if (evt.LeftUp())
@@ -507,7 +507,7 @@ bool GLToolbar::on_mouse(wxMouseEvent& evt, GLCanvas3D& parent)
     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_TOOLBAR_MOUSE_EVENT_HANDLING
+#endif // ENABLE_CANVAS_TOOLTIP_USING_IMGUI
 
     int item_id = contains_mouse(mouse_pos, parent);
 #if ENABLE_CANVAS_TOOLTIP_USING_IMGUI
@@ -551,10 +551,10 @@ bool GLToolbar::on_mouse(wxMouseEvent& evt, GLCanvas3D& parent)
                 parent.set_as_dirty();
             }
         }
-#if !ENABLE_MODIFIED_TOOLBAR_MOUSE_EVENT_HANDLING
+#if !ENABLE_CANVAS_TOOLTIP_USING_IMGUI
         else if (evt.LeftUp())
             processed = true;
-#endif // !ENABLE_MODIFIED_TOOLBAR_MOUSE_EVENT_HANDLING
+#endif // !ENABLE_CANVAS_TOOLTIP_USING_IMGUI
     }
 
     return processed;