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

Show gizmos and toolbars tooltips when hovering on a disabled item

Browse Source
This commit is contained in:
Enrico Turri
2019-01-16 11:10:24 +01:00
parent 02a22ba991
commit 52493e1739
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -530,6 +530,8 @@ std::string GLToolbar::update_hover_state_horizontal(const Vec2d& mouse_pos, GLC
GLToolbarItem::EState state = item->get_state();
bool inside = (left <= (float)scaled_mouse_pos(0)) && ((float)scaled_mouse_pos(0) <= right) && (bottom <= (float)scaled_mouse_pos(1)) && ((float)scaled_mouse_pos(1) <= top);
if (inside)
tooltip = item->get_tooltip();
switch (state)
{
@@ -545,9 +547,7 @@ std::string GLToolbar::update_hover_state_horizontal(const Vec2d& mouse_pos, GLC
}
case GLToolbarItem::Hover:
{
if (inside)
tooltip = item->get_tooltip();
else
if (!inside)
{
item->set_state(GLToolbarItem::Normal);
parent.set_as_dirty();
@@ -567,9 +567,7 @@ std::string GLToolbar::update_hover_state_horizontal(const Vec2d& mouse_pos, GLC
}
case GLToolbarItem::HoverPressed:
{
if (inside)
tooltip = item->get_tooltip();
else
if (!inside)
{
item->set_state(GLToolbarItem::Pressed);
parent.set_as_dirty();
@@ -623,6 +621,8 @@ std::string GLToolbar::update_hover_state_vertical(const Vec2d& mouse_pos, GLCan
GLToolbarItem::EState state = item->get_state();
bool inside = (left <= (float)scaled_mouse_pos(0)) && ((float)scaled_mouse_pos(0) <= right) && (bottom <= (float)scaled_mouse_pos(1)) && ((float)scaled_mouse_pos(1) <= top);
if (inside)
tooltip = item->get_tooltip();
switch (state)
{
@@ -638,9 +638,7 @@ std::string GLToolbar::update_hover_state_vertical(const Vec2d& mouse_pos, GLCan
}
case GLToolbarItem::Hover:
{
if (inside)
tooltip = item->get_tooltip();
else
if (!inside)
{
item->set_state(GLToolbarItem::Normal);
parent.set_as_dirty();
@@ -660,9 +658,7 @@ std::string GLToolbar::update_hover_state_vertical(const Vec2d& mouse_pos, GLCan
}
case GLToolbarItem::HoverPressed:
{
if (inside)
tooltip = item->get_tooltip();
else
if (!inside)
{
item->set_state(GLToolbarItem::Pressed);
parent.set_as_dirty();