Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Turri <enricoturri@seznam.cz>2018-12-06 14:37:39 +0300
committerEnrico Turri <enricoturri@seznam.cz>2018-12-06 14:37:39 +0300
commit8d78b23c7878e7880be6047eb7c6453dab570f96 (patch)
tree3342ab0bac825937649a78069090418cf5e90e3e /src/slic3r/GUI/GLToolbar.cpp
parentc908a4674ab1667de51e55675619a378483dc664 (diff)
Removal of tabs from plater -> Fixed buttons update when switching between views using keyboard
Diffstat (limited to 'src/slic3r/GUI/GLToolbar.cpp')
-rw-r--r--src/slic3r/GUI/GLToolbar.cpp14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp
index c06c0fa7b..d3bd54d56 100644
--- a/src/slic3r/GUI/GLToolbar.cpp
+++ b/src/slic3r/GUI/GLToolbar.cpp
@@ -939,7 +939,7 @@ int GLRadioToolbar::contains_mouse(const Vec2d& mouse_pos, const GLCanvas3D& par
return -1;
}
-std::string GLRadioToolbar::update_hover_state(const Vec2d& mouse_pos, const GLCanvas3D& parent)
+std::string GLRadioToolbar::update_hover_state(const Vec2d& mouse_pos, GLCanvas3D& parent)
{
float zoom = parent.get_camera_zoom();
float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
@@ -967,7 +967,10 @@ std::string GLRadioToolbar::update_hover_state(const Vec2d& mouse_pos, const GLC
case GLRadioToolbarItem::Normal:
{
if (inside)
+ {
item->set_state(GLRadioToolbarItem::Hover);
+ parent.set_as_dirty();
+ }
break;
}
@@ -976,14 +979,20 @@ std::string GLRadioToolbar::update_hover_state(const Vec2d& mouse_pos, const GLC
if (inside)
tooltip = item->get_tooltip();
else
+ {
item->set_state(GLRadioToolbarItem::Normal);
+ parent.set_as_dirty();
+ }
break;
}
case GLRadioToolbarItem::Pressed:
{
if (inside)
+ {
item->set_state(GLRadioToolbarItem::HoverPressed);
+ parent.set_as_dirty();
+ }
break;
}
@@ -992,7 +1001,10 @@ std::string GLRadioToolbar::update_hover_state(const Vec2d& mouse_pos, const GLC
if (inside)
tooltip = item->get_tooltip();
else
+ {
item->set_state(GLRadioToolbarItem::Pressed);
+ parent.set_as_dirty();
+ }
break;
}