diff --git a/resources/fonts/NanumGothic-Bold.ttf b/resources/fonts/NanumGothic-Bold.ttf new file mode 100644 index 000000000..92006ef5f Binary files /dev/null and b/resources/fonts/NanumGothic-Bold.ttf differ diff --git a/resources/fonts/NanumGothic-Regular.ttf b/resources/fonts/NanumGothic-Regular.ttf new file mode 100644 index 000000000..b8636c15d Binary files /dev/null and b/resources/fonts/NanumGothic-Regular.ttf differ diff --git a/resources/fonts/NotoSansJP-Bold.ttf b/resources/fonts/NotoSansJP-Bold.ttf deleted file mode 100644 index 384f8ebb8..000000000 Binary files a/resources/fonts/NotoSansJP-Bold.ttf and /dev/null differ diff --git a/resources/fonts/NotoSansJP-Regular.ttf b/resources/fonts/NotoSansJP-Regular.ttf deleted file mode 100644 index 1583096a2..000000000 Binary files a/resources/fonts/NotoSansJP-Regular.ttf and /dev/null differ diff --git a/resources/fonts/NotoSansKR-Bold.ttf b/resources/fonts/NotoSansKR-Bold.ttf deleted file mode 100644 index 6cf639eb7..000000000 Binary files a/resources/fonts/NotoSansKR-Bold.ttf and /dev/null differ diff --git a/resources/fonts/NotoSansKR-Regular.ttf b/resources/fonts/NotoSansKR-Regular.ttf deleted file mode 100644 index 1b14d3247..000000000 Binary files a/resources/fonts/NotoSansKR-Regular.ttf and /dev/null differ diff --git a/resources/fonts/SourceHanSansJP-Bold.otf b/resources/fonts/SourceHanSansJP-Bold.otf new file mode 100644 index 000000000..250e7e9eb Binary files /dev/null and b/resources/fonts/SourceHanSansJP-Bold.otf differ diff --git a/resources/fonts/SourceHanSansJP-Normal.otf b/resources/fonts/SourceHanSansJP-Normal.otf new file mode 100644 index 000000000..cc37de356 Binary files /dev/null and b/resources/fonts/SourceHanSansJP-Normal.otf differ diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp index 77e08cff8..ec50a49fc 100644 --- a/src/slic3r/GUI/ImGuiWrapper.cpp +++ b/src/slic3r/GUI/ImGuiWrapper.cpp @@ -2402,7 +2402,7 @@ void ImGuiWrapper::init_font(bool compress) //FIXME replace with io.Fonts->AddFontFromMemoryTTF(buf_decompressed_data, (int)buf_decompressed_size, m_font_size, nullptr, ranges.Data); //https://github.com/ocornut/imgui/issues/220 if (m_is_korean) - default_font = io.Fonts->AddFontFromFileTTF((Slic3r::resources_dir() + "/fonts/" + "NotoSansKR-Regular.ttf").c_str(), m_font_size, &cfg, ranges.Data); + default_font = io.Fonts->AddFontFromFileTTF((Slic3r::resources_dir() + "/fonts/" + "NanumGothic-Regular.ttf").c_str(), m_font_size, &cfg, ranges.Data); else default_font = io.Fonts->AddFontFromFileTTF((Slic3r::resources_dir() + "/fonts/" + "HarmonyOS_Sans_SC_Regular.ttf").c_str(), m_font_size, &cfg, ranges.Data); if (default_font == nullptr) { @@ -2413,7 +2413,7 @@ void ImGuiWrapper::init_font(bool compress) } 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/" + "NanumGothic-Bold.ttf").c_str(), m_font_size, &cfg, ranges.Data); else bold_font = io.Fonts->AddFontFromFileTTF((Slic3r::resources_dir() + "/fonts/" + "HarmonyOS_Sans_SC_Bold.ttf").c_str(), m_font_size, &cfg, ranges.Data); if (bold_font == nullptr) { diff --git a/src/slic3r/GUI/Widgets/Label.cpp b/src/slic3r/GUI/Widgets/Label.cpp index 6222d6e53..451aa5cd8 100644 --- a/src/slic3r/GUI/Widgets/Label.cpp +++ b/src/slic3r/GUI/Widgets/Label.cpp @@ -19,8 +19,11 @@ wxFont Label::sysFont(int size, bool bold, std::string lang_code) wxString face; if (lang_code == "ja") { - face = wxString::FromUTF8("Noto Sans JP"); - } else { + face = wxString::FromUTF8("Source Han Sans JP Normal"); + } else if (lang_code == "ko") { + face = wxString::FromUTF8("NanumGothic"); + } + else { face = wxString::FromUTF8("HarmonyOS Sans SC"); }