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

Fix of load imgui font without glyph in range(symbolic fonts)

Browse Source
This commit is contained in:
Filip Sykala 2022-05-13 08:33:31 +02:00
parent 48420b33d0
commit 378e791b82
2 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1139,7 +1139,8 @@ void GLGizmoEmboss::draw_text_input()
ImFont *imgui_font = m_font_manager.get_imgui_font(); ImFont *imgui_font = m_font_manager.get_imgui_font();
if (imgui_font == nullptr) { if (imgui_font == nullptr) {
// try create new imgui font // try create new imgui font
imgui_font = m_font_manager.create_imgui_font(create_range_text()); m_font_manager.create_imgui_font(create_range_text());
imgui_font = m_font_manager.get_imgui_font();
} }
bool exist_font = imgui_font != nullptr; bool exist_font = imgui_font != nullptr;
assert(!exist_font || imgui_font->IsLoaded()); assert(!exist_font || imgui_font->IsLoaded());
@ -1556,15 +1557,15 @@ void GLGizmoEmboss::draw_style_list() {
} }
// delete button // delete button
ImGui::SameLine(m_gui_cfg->delete_pos_x); //ImGui::SameLine(m_gui_cfg->delete_pos_x);
if (draw_button(IconType::erase, is_selected) && !is_selected) //if (draw_button(IconType::erase, is_selected) && !is_selected)
delete_index = index; // delete_index = index;
if (ImGui::IsItemHovered()) { //if (ImGui::IsItemHovered()) {
std::string tooltip = (is_selected)? // std::string tooltip = (is_selected)?
GUI::format(_L("Active style \"%1%\" can't be deleted."), actual_style_name) : // GUI::format(_L("Active style \"%1%\" can't be deleted."), actual_style_name) :
GUI::format(_L("Delete \"%1%\" style."), actual_style_name); // GUI::format(_L("Delete \"%1%\" style."), actual_style_name);
ImGui::SetTooltip("%s", tooltip.c_str()); // ImGui::SetTooltip("%s", tooltip.c_str());
} //}
ImGui::PopID(); ImGui::PopID();
} }
@ -1577,8 +1578,8 @@ void GLGizmoEmboss::draw_style_list() {
ImGui::SetTooltip("%s", _u8L("Style selector").c_str()); ImGui::SetTooltip("%s", _u8L("Style selector").c_str());
// delete font item // delete font item
if (delete_index.has_value()) //if (delete_index.has_value())
m_font_manager.erase(*delete_index); // m_font_manager.erase(*delete_index);
ImGui::SameLine(); ImGui::SameLine();
bool start_rename = false; bool start_rename = false;
@ -1658,10 +1659,9 @@ void GLGizmoEmboss::draw_style_list() {
else if (!is_stored) else if (!is_stored)
ImGui::SetTooltip("%s", _u8L("Nothing to reload from").c_str()); ImGui::SetTooltip("%s", _u8L("Nothing to reload from").c_str());
else if (!is_changed) else if (!is_changed)
ImGui::SetTooltip("%s", _u8L("Everything is already restored").c_str()); ImGui::SetTooltip("%s", _u8L("No change to restore from style").c_str());
} }
#ifdef ALLOW_REVERT_ALL_STYLES #ifdef ALLOW_REVERT_ALL_STYLES
ImGui::SameLine(); ImGui::SameLine();
if (draw_button(IconType::revert_all)) { if (draw_button(IconType::revert_all)) {
@ -1677,6 +1677,25 @@ void GLGizmoEmboss::draw_style_list() {
}else if (ImGui::IsItemHovered()) }else if (ImGui::IsItemHovered())
ImGui::SetTooltip("%s", _u8L("Revert all styles").c_str()); ImGui::SetTooltip("%s", _u8L("Revert all styles").c_str());
#endif // ALLOW_REVERT_ALL_STYLES #endif // ALLOW_REVERT_ALL_STYLES
// delete font item
if (delete_index.has_value())
m_font_manager.erase(*delete_index);
// delete button
ImGui::SameLine();
bool can_delete = false;
if (draw_button(IconType::erase, !can_delete)) {
delete_index = 1;
}
if (ImGui::IsItemHovered()) {
std::string style_name = "";
std::string tooltip =
(can_delete) ?
GUI::format(_L("Active style \"%1%\" can't be deleted."), style_name) :
GUI::format(_L("Delete \"%1%\" style."), style_name);
ImGui::SetTooltip("%s", tooltip.c_str());
}
} }
bool GLGizmoEmboss::italic_button() bool GLGizmoEmboss::italic_button()

2
src/slic3r/Utils/FontManager.cpp
View File

@ -259,6 +259,8 @@ ImFont *FontManager::get_imgui_font(size_t item_index)
if (font == nullptr) return nullptr; if (font == nullptr) return nullptr;
if (!font->IsLoaded()) return nullptr; if (!font->IsLoaded()) return nullptr;
if (font->Scale <= 0.f) return nullptr; if (font->Scale <= 0.f) return nullptr;
// Symbol fonts doesn't have atlas because their glyph range is out of language range
if (font->ContainerAtlas == nullptr) return nullptr;
return font; return font;
} }