mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only use modified scaling on Windows 

And only if the system's scaling factor is greater than 300%.
This commit is contained in:
Leland Lucius 2024-01-05 22:36:18 -06:00
parent a77847c2ad
commit 2b6800b026
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6428,7 +6428,17 @@ void GLCanvas3D::_resize(unsigned int w, unsigned int h)
m_last_w = w; m_last_w = w;
m_last_h = h; m_last_h = h;
const float font_size = 1.0f * wxGetApp().em_unit(); float font_size = wxGetApp().em_unit();
#ifdef _WIN32
// On Windows, if manually scaled here, rendering issues can occur when the system's Display
// scaling is greater than 300% as the font's size gets to be to large. So, use imgui font
// scaling instead (see: ImGuiWrapper::init_font() and issue #3401)
font_size *= (font_size > 30.0f) ? 1.0f : 1.5f;
#else
font_size *= 1.5f;
#endif
#if ENABLE_RETINA_GL #if ENABLE_RETINA_GL
imgui->set_scaling(font_size, 1.0f, m_retina_helper->get_scale_factor()); imgui->set_scaling(font_size, 1.0f, m_retina_helper->get_scale_factor());
#else #else

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

@ -2110,7 +2110,6 @@ void ImGuiWrapper::init_font(bool compress)
throw Slic3r::RuntimeError("ImGui: Could not load deafult font"); throw Slic3r::RuntimeError("ImGui: Could not load deafult font");
} }
} }
default_font->Scale = 1.5f;
if (m_is_korean) if (m_is_korean)
bold_font = io.Fonts->AddFontFromFileTTF((Slic3r::resources_dir() + "/fonts/" + "NotoSansKR-Bold.ttf").c_str(), m_font_size, &cfg, ranges.Data); bold_font = io.Fonts->AddFontFromFileTTF((Slic3r::resources_dir() + "/fonts/" + "NotoSansKR-Bold.ttf").c_str(), m_font_size, &cfg, ranges.Data);
@ -2120,7 +2119,15 @@ void ImGuiWrapper::init_font(bool compress)
bold_font = io.Fonts->AddFontDefault(); bold_font = io.Fonts->AddFontDefault();
if (bold_font == nullptr) { throw Slic3r::RuntimeError("ImGui: Could not load deafult font"); } if (bold_font == nullptr) { throw Slic3r::RuntimeError("ImGui: Could not load deafult font"); }
} }
bold_font->Scale = 1.5f;
#ifdef _WIN32
// Render the text a bit larger (see GLCanvas3D::_resize() and issue #3401), but only if the scale factor
// for the Display is greater than 300%.
if (wxGetApp().em_unit() > 30) {
default_font->Scale = 1.5f;
bold_font->Scale = 1.5f;
}
#endif
#ifdef __APPLE__ #ifdef __APPLE__
ImFontConfig config; ImFontConfig config;