GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-01 00:11:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a crash, when press "Esc" key in TextEdit control

Browse Source 
Fix for #13458 - Crash using cut tool. (SPE-2545)
This commit is contained in:
YuSanka 2024-11-01 15:43:55 +01:00 committed by Lukas Matena
parent 7ca4faf009
commit da79ad4937
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundled_deps/imgui/imgui/imgui_draw.cpp
View File

@ -3293,7 +3293,7 @@ const ImFontGlyph* ImFont::FindGlyph(ImWchar c) const
} }
const ImWchar i = IndexLookup.Data[c]; const ImWchar i = IndexLookup.Data[c];
if (i == (ImWchar)-1) { if (i == (ImWchar)-1) {
imgui_rendered_fallback_glyph(c); imgui_rendered_fallback_glyph(c);
return FallbackGlyph; return FallbackGlyph;
} }
return &Glyphs.Data[i]; return &Glyphs.Data[i];

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

@ -57,6 +57,9 @@ bool s_font_cjk;
// a fallback glyph for c. // a fallback glyph for c.
void imgui_rendered_fallback_glyph(ImWchar c) void imgui_rendered_fallback_glyph(ImWchar c)
{ {
if (c == 0)
return;
if (ImGui::GetIO().Fonts->Fonts[0] == ImGui::GetFont()) { if (ImGui::GetIO().Fonts->Fonts[0] == ImGui::GetFont()) {
// Only do this when we are using the default ImGui font. Otherwise this would conflict with // Only do this when we are using the default ImGui font. Otherwise this would conflict with
// EmbossStyleManager's font handling and we would load glyphs needlessly. // EmbossStyleManager's font handling and we would load glyphs needlessly.