Rectangle selection in 3D scene -> refactored GLVolume member varialbe for hovering

This commit is contained in:
Enrico Turri 2019-04-25 10:21:24 +02:00
parent 51e1f5cd97
commit d2d06c9f73
4 changed files with 18 additions and 15 deletions
src/slic3r/GUI

View file

@ -252,8 +252,7 @@ GLVolume::GLVolume(float r, float g, float b, float a)
, zoom_to_volumes(true)
, shader_outside_printer_detection_enabled(false)
, is_outside(false)
, hover_select(false)
, hover_deselect(false)
, hover(None)
, is_modifier(false)
, is_wipe_tower(false)
, is_extrusion_path(false)
@ -293,9 +292,9 @@ void GLVolume::set_render_color()
if (force_native_color)
set_render_color(color, 4);
else {
if (hover_select)
if (hover == Select)
set_render_color(HOVER_SELECT_COLOR, 4);
else if (hover_deselect)
else if (hover == Deselect)
set_render_color(HOVER_DESELECT_COLOR, 4);
else if (selected)
set_render_color(is_outside ? SELECTED_OUTSIDE_COLOR : SELECTED_COLOR, 4);