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

Delete volume when close gizmo with empty text

Browse Source
This commit is contained in:
Filip Sykala 2022-05-11 19:49:46 +02:00
parent 73edac761b
commit f746925781
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View File

@ -103,6 +103,12 @@ struct Limits
} }
}; };
static const Limits limits; static const Limits limits;
static bool is_text_empty(const std::string &text){
return text.empty() ||
text.find_first_not_of(" \n\t\r") == std::string::npos;
}
} // namespace } // namespace
GLGizmoEmboss::GLGizmoEmboss(GLCanvas3D &parent) GLGizmoEmboss::GLGizmoEmboss(GLCanvas3D &parent)
@ -962,8 +968,24 @@ bool GLGizmoEmboss::process()
void GLGizmoEmboss::close() void GLGizmoEmboss::close()
{ {
// remove volume when text is empty
if (m_volume != nullptr &&
m_volume->text_configuration.has_value() &&
is_text_empty(m_text)) {
Plater &p = *wxGetApp().plater();
if (is_text_object(m_volume)) {
// delete whole object
p.remove(m_parent.get_selection().get_object_idx());
} else {
// delete text volume
p.remove_selected();
}
}
// close gizmo == open it again // close gizmo == open it again
m_parent.get_gizmos_manager().open_gizmo(GLGizmosManager::Emboss); auto& mng = m_parent.get_gizmos_manager();
if (mng.get_current_type() == GLGizmosManager::Emboss)
mng.open_gizmo(GLGizmosManager::Emboss);
} }
void GLGizmoEmboss::fill_stored_font_items() void GLGizmoEmboss::fill_stored_font_items()
@ -1154,8 +1176,7 @@ void GLGizmoEmboss::draw_text_input()
tool_tip += t; tool_tip += t;
} }
}; };
if (m_text.empty() || if (is_text_empty(m_text))
m_text.find_first_not_of(" \n\t\r") == std::string::npos)
append_warning(_u8L("Empty"), append_warning(_u8L("Empty"),
_u8L("Embossed text can NOT contain only white spaces.")); _u8L("Embossed text can NOT contain only white spaces."));
if (m_text_contain_unknown_glyph) if (m_text_contain_unknown_glyph)