3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move gizmo -> 1) Grabbers showing tooltip also on hover for single instance selection. 2) Tooltip showing current position for single instance selection.

Browse source
This commit is contained in:
Enrico Turri 2018-10-24 13:28:35 +02:00
parent e3b4a7b206
commit 9b3e3ec967
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/slic3r/GUI/GLGizmo.cpp
View file

@ -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) void GLGizmoMove3D::on_update(const Linef3& mouse_ray)
{ {
#if ENABLE_EXTENDED_SELECTION #if ENABLE_EXTENDED_SELECTION
@ -1267,12 +1274,15 @@ void GLGizmoMove3D::on_render(const BoundingBoxf3& box) const
#endif // ENABLE_EXTENDED_SELECTION #endif // ENABLE_EXTENDED_SELECTION
{ {
#if ENABLE_EXTENDED_SELECTION #if ENABLE_EXTENDED_SELECTION
if (m_grabbers[0].dragging) bool show_position = selection.is_single_full_instance();
set_tooltip("X: " + format(m_displacement(0), 2)); const Vec3d& position = selection.get_bounding_box().center();
else if (m_grabbers[1].dragging)
set_tooltip("Y: " + format(m_displacement(1), 2)); if ((show_position && (m_hover_id == 0)) || m_grabbers[0].dragging)
else if (m_grabbers[2].dragging) set_tooltip("X: " + format(show_position ? position(0) : m_displacement(0), 2));
set_tooltip("Z: " + format(m_displacement(2), 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 #else
if (m_grabbers[0].dragging) if (m_grabbers[0].dragging)
set_tooltip("X: " + format(m_position(0), 2)); set_tooltip("X: " + format(m_position(0), 2));

1
src/slic3r/GUI/GLGizmo.hpp
View file

@ -391,6 +391,7 @@ protected:
virtual bool on_init(); virtual bool on_init();
#if ENABLE_EXTENDED_SELECTION #if ENABLE_EXTENDED_SELECTION
virtual void on_start_dragging(const GLCanvas3D::Selection& selection); virtual void on_start_dragging(const GLCanvas3D::Selection& selection);
virtual void on_stop_dragging();
#else #else
virtual void on_start_dragging(const BoundingBoxf3& box); virtual void on_start_dragging(const BoundingBoxf3& box);
#endif // ENABLE_EXTENDED_SELECTION #endif // ENABLE_EXTENDED_SELECTION