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

New selection -> Force volume selection when right clicking to get the object context menu

Browse source
This commit is contained in:
Enrico Turri 2018-10-18 08:51:06 +02:00
parent 593eabd7c7
commit 143c23c54a
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -3949,7 +3949,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
#endif // ENABLE_EXTENDED_SELECTION
{
#if ENABLE_EXTENDED_SELECTION
if (m_hover_volume_id != -1)
if (evt.LeftDown() && (m_hover_volume_id != -1))
{
if (evt.ControlDown())
m_selection.remove(m_hover_volume_id);
@ -4043,13 +4043,24 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
render();
if (m_hover_volume_id != -1)
{
// if right clicking on volume, propagate event through callback (shows context menu)
#if ENABLE_EXTENDED_SELECTION
if (m_volumes.volumes[m_hover_volume_id]->hover)
#else
if (m_volumes.volumes[volume_idx]->hover)
#endif // ENABLE_EXTENDED_SELECTION
// if right clicking on volume, propagate event through callback (shows context menu)
if (m_volumes.volumes[m_hover_volume_id]->hover && !m_volumes.volumes[m_hover_volume_id]->is_wipe_tower)
{
// forces the selection of the volume
m_selection.add(m_hover_volume_id);
m_gizmos.update_on_off_state(m_selection);
update_gizmos_data();
wxGetApp().obj_manipul()->update_settings_value(m_selection);
// forces a frame render to update the view before the context menu is shown
render();
post_event(Vec2dEvent(EVT_GLCANVAS_RIGHT_CLICK, pos.cast<double>()));
}
#else
// if right clicking on volume, propagate event through callback (shows context menu)
if (m_volumes.volumes[volume_idx]->hover)
post_event(Vec2dEvent(EVT_GLCANVAS_RIGHT_CLICK, pos.cast<double>()));
#endif // ENABLE_EXTENDED_SELECTION
}
}
}