From 9b3e3ec96789563775a7bb352ee25cfc616bc914 Mon Sep 17 00:00:00 2001
From: Enrico Turri <enricoturri@seznam.cz>
Date: Wed, 24 Oct 2018 13:28:35 +0200
Subject: [PATCH] Move gizmo -> 1) Grabbers showing tooltip also on hover for
 single instance selection. 2) Tooltip showing current position for single
 instance selection.

---
 src/slic3r/GUI/GLGizmo.cpp | 22 ++++++++++++++++------
 src/slic3r/GUI/GLGizmo.hpp |  1 +
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/slic3r/GUI/GLGizmo.cpp b/src/slic3r/GUI/GLGizmo.cpp
index 2f75d43fd..1bd9cc235 100644
--- a/src/slic3r/GUI/GLGizmo.cpp
+++ b/src/slic3r/GUI/GLGizmo.cpp
@@ -1241,6 +1241,13 @@ void GLGizmoMove3D::on_start_dragging(const BoundingBoxf3& box)
     }
 }
 
+#if ENABLE_EXTENDED_SELECTION
+void GLGizmoMove3D::on_stop_dragging()
+{
+    m_displacement = Vec3d::Zero();
+}
+#endif // ENABLE_EXTENDED_SELECTION
+
 void GLGizmoMove3D::on_update(const Linef3& mouse_ray)
 {
 #if ENABLE_EXTENDED_SELECTION
@@ -1267,12 +1274,15 @@ void GLGizmoMove3D::on_render(const BoundingBoxf3& box) const
 #endif // ENABLE_EXTENDED_SELECTION
 {
 #if ENABLE_EXTENDED_SELECTION
-    if (m_grabbers[0].dragging)
-        set_tooltip("X: " + format(m_displacement(0), 2));
-    else if (m_grabbers[1].dragging)
-        set_tooltip("Y: " + format(m_displacement(1), 2));
-    else if (m_grabbers[2].dragging)
-        set_tooltip("Z: " + format(m_displacement(2), 2));
+    bool show_position = selection.is_single_full_instance();
+    const Vec3d& position = selection.get_bounding_box().center();
+
+    if ((show_position && (m_hover_id == 0)) || m_grabbers[0].dragging)
+        set_tooltip("X: " + format(show_position ? position(0) : m_displacement(0), 2));
+    else if ((show_position && (m_hover_id == 1)) || m_grabbers[1].dragging)
+        set_tooltip("Y: " + format(show_position ? position(1) : m_displacement(1), 2));
+    else if ((show_position && (m_hover_id == 2)) || m_grabbers[2].dragging)
+        set_tooltip("Z: " + format(show_position ? position(2) : m_displacement(2), 2));
 #else
     if (m_grabbers[0].dragging)
         set_tooltip("X: " + format(m_position(0), 2));
diff --git a/src/slic3r/GUI/GLGizmo.hpp b/src/slic3r/GUI/GLGizmo.hpp
index 1f2b77ab8..38f72598e 100644
--- a/src/slic3r/GUI/GLGizmo.hpp
+++ b/src/slic3r/GUI/GLGizmo.hpp
@@ -391,6 +391,7 @@ protected:
     virtual bool on_init();
 #if ENABLE_EXTENDED_SELECTION
     virtual void on_start_dragging(const GLCanvas3D::Selection& selection);
+    virtual void on_stop_dragging();
 #else
     virtual void on_start_dragging(const BoundingBoxf3& box);
 #endif // ENABLE_EXTENDED_SELECTION