juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removal of tabs from plater -> Fixed buttons update when switching between views using keyboard

Browse Source
This commit is contained in:
Enrico Turri
2018-12-06 12:37:39 +01:00
parent c908a4674a
commit 8d78b23c78
5 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/slic3r/GUI/GLToolbar.cpp
View File

@@ -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;
}