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

Less agressive warning about bad visualization inside of text input

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-03-08 15:10:36 +01:00
parent 6adc2cf733
commit 49bd17a0af
1 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,6 +223,7 @@ enum class IconType : unsigned {
unbold, unbold,
system_selector, system_selector,
open_file, open_file,
exclamation,
// automatic calc of icon's count // automatic calc of icon's count
_count _count
}; };
@ -1283,6 +1284,8 @@ void GLGizmoEmboss::draw_window()
#endif // ALLOW_FLOAT_WINDOW #endif // ALLOW_FLOAT_WINDOW
} }
#include "imgui/imgui_internal.h" // scroll bar existence
void GLGizmoEmboss::draw_text_input() void GLGizmoEmboss::draw_text_input()
{ {
auto create_range_text_prep = [&mng = m_style_manager, &text = m_text, &exist_unknown = m_text_contain_unknown_glyph]() { auto create_range_text_prep = [&mng = m_style_manager, &text = m_text, &exist_unknown = m_text_contain_unknown_glyph]() {
@ -1312,75 +1315,69 @@ void GLGizmoEmboss::draw_text_input()
if (exist_font) ImGui::PushFont(imgui_font); if (exist_font) ImGui::PushFont(imgui_font);
// show warning about incorrectness view of font // show warning about incorrectness view of font
std::string warning; std::string warning_tool_tip;
std::string tool_tip;
if (!exist_font) { if (!exist_font) {
warning = _u8L("Can't write text by selected font."); warning_tool_tip = _u8L("Can't write text by selected font.Try to choose another font.");
tool_tip = _u8L("Try to choose another font.");
} else { } else {
std::string who; auto append_warning = [&warning_tool_tip](std::string t) {
auto append_warning = [&who, &tool_tip](std::string w, std::string t) { if (!warning_tool_tip.empty())
if (!w.empty()) { warning_tool_tip += "\n";
if (!who.empty()) who += " & "; warning_tool_tip += t;
who += w;
}
if (!t.empty()) {
if (!tool_tip.empty()) tool_tip += "\n";
tool_tip += t;
}
}; };
if (priv::is_text_empty(m_text)) append_warning(_u8L("Empty"), _u8L("Embossed text can NOT contain only white spaces.")); if (priv::is_text_empty(m_text))
append_warning(_u8L("Embossed text can NOT contain only white spaces."));
if (m_text_contain_unknown_glyph) if (m_text_contain_unknown_glyph)
append_warning(_u8L("Bad symbol"), _u8L("Text contain character glyph (represented by '?') unknown by font.")); append_warning(_u8L("Text contain character glyph (represented by '?') unknown by font."));
const FontProp &prop = m_style_manager.get_font_prop(); const FontProp &prop = m_style_manager.get_font_prop();
if (prop.skew.has_value()) append_warning(_u8L("Skew"), _u8L("Unsupported visualization of font skew for text input.")); if (prop.skew.has_value()) append_warning(_u8L("Text input do not show font skew."));
if (prop.boldness.has_value()) append_warning(_u8L("Boldness"), _u8L("Unsupported visualization of font boldness for text input.")); if (prop.boldness.has_value()) append_warning(_u8L("Text input do not show font boldness."));
if (prop.line_gap.has_value()) if (prop.line_gap.has_value())
append_warning(_u8L("Line gap"), _u8L("Unsupported visualization of gap between lines inside text input.")); append_warning(_u8L("Text input do not show gap between lines."));
auto &ff = m_style_manager.get_font_file_with_cache(); auto &ff = m_style_manager.get_font_file_with_cache();
float imgui_size = StyleManager::get_imgui_font_size(prop, *ff.font_file, scale); float imgui_size = StyleManager::get_imgui_font_size(prop, *ff.font_file, scale);
if (imgui_size > StyleManager::max_imgui_font_size) if (imgui_size > StyleManager::max_imgui_font_size)
append_warning(_u8L("Too tall"), _u8L("Diminished font height inside text input.")); append_warning(_u8L("Too tall, diminished font height inside text input."));
if (imgui_size < StyleManager::min_imgui_font_size) if (imgui_size < StyleManager::min_imgui_font_size)
append_warning(_u8L("Too small"), _u8L("Enlarged font height inside text input.")); append_warning(_u8L("Too small, enlarged font height inside text input."));
if (!who.empty()) warning = GUI::format(_L("%1% is NOT shown."), who);
} }
// add border around input when warning appears
ScopeGuard input_border_sg;
if (!warning.empty()) {
ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
ImGui::PushStyleColor(ImGuiCol_Border, ImGuiWrapper::COL_ORANGE_LIGHT);
input_border_sg.closure = []() { ImGui::PopStyleColor(); ImGui::PopStyleVar(); };
}
// flag for extend font ranges if neccessary // flag for extend font ranges if neccessary
// ranges can't be extend during font is activ(pushed) // ranges can't be extend during font is activ(pushed)
std::string range_text; std::string range_text;
float window_height = ImGui::GetWindowHeight(); float window_height = ImGui::GetWindowHeight();
float minimal_height = get_minimal_window_size().y; float minimal_height = get_minimal_window_size().y;
float extra_height = window_height - minimal_height; float extra_height = window_height - minimal_height;
ImVec2 text_size(m_gui_cfg->text_size.x, ImVec2 input_size(m_gui_cfg->text_size.x, m_gui_cfg->text_size.y + extra_height);
m_gui_cfg->text_size.y + extra_height);
const ImGuiInputTextFlags flags = ImGuiInputTextFlags_AllowTabInput | ImGuiInputTextFlags_AutoSelectAll; const ImGuiInputTextFlags flags = ImGuiInputTextFlags_AllowTabInput | ImGuiInputTextFlags_AutoSelectAll;
if (ImGui::InputTextMultiline("##Text", &m_text, text_size, flags)) { if (ImGui::InputTextMultiline("##Text", &m_text, input_size, flags)) {
process(); process();
range_text = create_range_text_prep(); range_text = create_range_text_prep();
} }
if (exist_font) ImGui::PopFont(); if (exist_font) ImGui::PopFont();
if (!warning.empty()) { // warning tooltip has to be with default font
if (ImGui::IsItemHovered() && !tool_tip.empty()) if (!warning_tool_tip.empty()) {
ImGui::SetTooltip("%s", tool_tip.c_str()); // Multiline input has hidden window for scrolling
ImGuiWindow *input = ImGui::GetCurrentWindow()->DC.ChildWindows.front();
const ImGuiStyle &style = ImGui::GetStyle();
float scrollbar_width = (input->ScrollbarY) ? style.ScrollbarSize : 0.f;
float scrollbar_height = (input->ScrollbarX) ? style.ScrollbarSize : 0.f;
bool hovered = ImGui::IsItemHovered();
if (hovered)
ImGui::SetTooltip("%s", warning_tool_tip.c_str());
ImVec2 cursor = ImGui::GetCursorPos(); ImVec2 cursor = ImGui::GetCursorPos();
float width = ImGui::GetContentRegionAvailWidth(); float width = ImGui::GetContentRegionAvailWidth();
ImVec2 size = ImGui::CalcTextSize(warning.c_str()); const ImVec2& padding = style.FramePadding;
ImVec2 padding = ImGui::GetStyle().FramePadding; ImVec2 icon_pos(width - m_gui_cfg->icon_width - scrollbar_width + padding.x,
ImGui::SetCursorPos(ImVec2(width - size.x + padding.x, cursor.y - m_gui_cfg->icon_width - scrollbar_height - 2*padding.y);
cursor.y - size.y - padding.y));
m_imgui->text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, warning); ImGui::SetCursorPos(icon_pos);
draw(get_icon(m_icons, IconType::exclamation, IconState::hovered));
ImGui::SetCursorPos(cursor); ImGui::SetCursorPos(cursor);
} }
@ -2376,7 +2373,7 @@ bool GLGizmoEmboss::draw_italic_button()
const wxFont &wx_font = m_style_manager.get_wx_font(); const wxFont &wx_font = m_style_manager.get_wx_font();
const auto& ff = m_style_manager.get_font_file_with_cache(); const auto& ff = m_style_manager.get_font_file_with_cache();
if (!wx_font.IsOk() || !ff.has_value()) { if (!wx_font.IsOk() || !ff.has_value()) {
draw(*m_icons[(int) IconType::italic][(int)IconState::disabled]); draw(get_icon(m_icons, IconType::italic, IconState::disabled));
return false; return false;
} }
@ -3316,7 +3313,8 @@ void GLGizmoEmboss::init_icons()
"make_bold.svg", "make_bold.svg",
"make_unbold.svg", "make_unbold.svg",
"search.svg", "search.svg",
"open.svg" "open.svg",
"exclamation.svg"
}; };
assert(filenames.size() == static_cast<size_t>(IconType::_count)); assert(filenames.size() == static_cast<size_t>(IconType::_count));
std::string path = resources_dir() + "/icons/"; std::string path = resources_dir() + "/icons/";