3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable "Search"/"Arrange options" ImGui dialog, when some of gizmos is active

Browse Source
This commit is contained in:
YuSanka 2023-01-19 10:10:41 +01:00
parent eee4453993
commit d681b99c10
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -4745,7 +4745,7 @@ bool GLCanvas3D::_init_main_toolbar()
}; };
item.left.action_callback = GLToolbarItem::Default_Action_Callback; item.left.action_callback = GLToolbarItem::Default_Action_Callback;
item.visibility_callback = GLToolbarItem::Default_Visibility_Callback; item.visibility_callback = GLToolbarItem::Default_Visibility_Callback;
item.enabling_callback = GLToolbarItem::Default_Enabling_Callback; item.enabling_callback = [this]()->bool { return m_gizmos.get_current_type() == GLGizmosManager::Undefined; };
if (!m_main_toolbar.add_item(item)) if (!m_main_toolbar.add_item(item))
return false; return false;

3
src/slic3r/GUI/Plater.cpp
View File

@ -5015,8 +5015,7 @@ bool Plater::priv::can_split_to_volumes() const
bool Plater::priv::can_arrange() const bool Plater::priv::can_arrange() const
{ {
if (model.objects.empty() || !m_worker.is_idle()) return false; if (model.objects.empty() || !m_worker.is_idle()) return false;
if (q->canvas3D()->get_gizmos_manager().get_current_type() == GLGizmosManager::Emboss) return false; return q->canvas3D()->get_gizmos_manager().get_current_type() == GLGizmosManager::Undefined;
return true;
} }
bool Plater::priv::can_layers_editing() const bool Plater::priv::can_layers_editing() const