mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 16:57:53 -06:00
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
This commit is contained in:
commit
414ea1a86e
15 changed files with 95 additions and 30 deletions
|
@ -3253,6 +3253,7 @@ bool GLCanvas3D::Gizmos::handle_shortcut(int key, const Selection& selection)
|
|||
if (!m_enabled || selection.is_empty())
|
||||
return false;
|
||||
|
||||
EType old_current = m_current;
|
||||
bool handled = false;
|
||||
for (GizmosMap::iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
|
||||
{
|
||||
|
@ -3276,7 +3277,12 @@ bool GLCanvas3D::Gizmos::handle_shortcut(int key, const Selection& selection)
|
|||
handled = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
}
|
||||
|
||||
if (handled && (old_current != Undefined) && (old_current != m_current))
|
||||
{
|
||||
GizmosMap::const_iterator it = m_gizmos.find(old_current);
|
||||
if (it != m_gizmos.end())
|
||||
it->second->set_state(GLGizmoBase::Off);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue