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

ENH: update jp and ko font 

JIRA: STUDIO-8263

Change-Id: I521b15dd24d1625703dd2afe88430aa6e984d622
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2024-10-14 11:15:17 +08:00 committed by Lane.Wei
parent 45caf3e930
commit ec0226485d
10 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/fonts/NanumGothic-Bold.ttf Normal file
View File

Binary file not shown.

BIN
resources/fonts/NanumGothic-Regular.ttf Normal file
View File

Binary file not shown.

BIN
resources/fonts/NotoSansJP-Bold.ttf
View File

Binary file not shown.

BIN
resources/fonts/NotoSansJP-Regular.ttf
View File

Binary file not shown.

BIN
resources/fonts/NotoSansKR-Bold.ttf
View File

Binary file not shown.

BIN
resources/fonts/NotoSansKR-Regular.ttf
View File

Binary file not shown.

BIN
resources/fonts/SourceHanSansJP-Bold.otf Normal file
View File

Binary file not shown.

BIN
resources/fonts/SourceHanSansJP-Normal.otf Normal file
View File

Binary file not shown.

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

@ -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) {

7
src/slic3r/GUI/Widgets/Label.cpp
View File

@ -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");
}