From a0640d2d24eeed796f5946e9345083288ac62718 Mon Sep 17 00:00:00 2001
From: Enrico Turri <enricoturri@seznam.cz>
Date: Thu, 25 Apr 2019 12:31:55 +0200
Subject: [PATCH] Rectangle selection in 3D scene -> selection update

---
 src/slic3r/GUI/GLCanvas3D.cpp | 32 ++++++++++++++++++++++++++++++++
 src/slic3r/GUI/GLCanvas3D.hpp |  3 +++
 2 files changed, 35 insertions(+)

diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index d1354f2f5..20babc470 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -2375,6 +2375,7 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
                 {
                     if (m_picking_enabled && m_rectangle_selection.is_dragging())
                     {
+                        _update_selection_from_hover();
                         m_rectangle_selection.stop_dragging();
                         m_dirty = true;
                     }
@@ -2384,6 +2385,7 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
                 {
                     if (m_picking_enabled && m_rectangle_selection.is_dragging())
                     {
+                        _update_selection_from_hover();
                         m_rectangle_selection.stop_dragging();
                         m_dirty = true;
                     }
@@ -2840,6 +2842,9 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
         }
         else if (evt.LeftUp() && m_picking_enabled && m_rectangle_selection.is_dragging())
         {
+            if (evt.ShiftDown() || evt.AltDown())
+                _update_selection_from_hover();
+
             m_rectangle_selection.stop_dragging();
         }
         else if (evt.LeftUp() && !m_mouse.dragging && m_hover_volume_idxs.empty() && !is_layers_editing_enabled())
@@ -5584,6 +5589,33 @@ void GLCanvas3D::_resize_toolbars() const
 }
 #endif // !ENABLE_SVG_ICONS
 
+void GLCanvas3D::_update_selection_from_hover()
+{
+    if (m_hover_volume_idxs.empty())
+        return;
+
+    GLSelectionRectangle::EState state = m_rectangle_selection.get_state();
+    bool is_ctrl_pressed = wxGetKeyState(WXK_CONTROL);
+
+    bool is_single_modifier = (m_hover_volume_idxs.size() == 1) && m_volumes.volumes[m_hover_volume_idxs.front()]->is_modifier;
+
+    if ((state == GLSelectionRectangle::Select) && !is_ctrl_pressed)
+        m_selection.clear();
+
+    for (int idx : m_hover_volume_idxs)
+    {
+        if (state == GLSelectionRectangle::Select)
+            m_selection.add(idx, is_single_modifier && !is_ctrl_pressed);
+        else
+            m_selection.remove(idx);
+    }
+
+    m_gizmos.refresh_on_off_state(m_selection);
+    m_gizmos.update_data(*this);
+    post_event(SimpleEvent(EVT_GLCANVAS_OBJECT_SELECT));
+    m_dirty = true;
+}
+
 const Print* GLCanvas3D::fff_print() const
 {
     return (m_process == nullptr) ? nullptr : m_process->fff_print();
diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
index 9e2d87bdb..57083cfa0 100644
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@@ -714,6 +714,9 @@ private:
     void _resize_toolbars() const;
 #endif // !ENABLE_SVG_ICONS
 
+    // updates the selection from the content of m_hover_volume_idxs
+    void _update_selection_from_hover();
+
     static std::vector<float> _parse_colors(const std::vector<std::string>& colors);
 
 public: