1
0
mirror of https://github.com/danog/patches.git synced 2024-11-30 04:19:34 +01:00
patches/qtbase_5_12_8/0008-fix-cjk-font-fallback.patch

116 lines
2.4 KiB
Diff
Raw Normal View History

diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
2020-06-20 12:07:36 +02:00
index 9e6e5d88c7..e6c8519a23 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
2020-06-20 12:07:36 +02:00
@@ -1694,50 +1694,90 @@ HFONT QWindowsFontDatabase::systemFont()
static const char *other_tryFonts[] = {
"Arial",
- "MS UI Gothic",
- "Gulim",
- "SimSun",
- "PMingLiU",
+ "Yu Gothic UI",
+ "Meiryo UI",
+ "Yu Gothic",
+ "Meiryo",
+ "Malgun Gothic",
+ "Microsoft YaHei UI",
+ "Microsoft YaHei",
+ "Microsoft JhengHei UI",
+ "Microsoft JhengHei",
+ "Nirmala UI",
+ "Iskoola Pota",
2020-06-20 12:07:36 +02:00
+ "Ebrima",
"Arial Unicode MS",
0
};
static const char *jp_tryFonts [] = {
- "MS UI Gothic",
+ "Yu Gothic UI",
+ "Meiryo UI",
+ "Yu Gothic",
+ "Meiryo",
"Arial",
- "Gulim",
- "SimSun",
- "PMingLiU",
+ "Malgun Gothic",
+ "Microsoft YaHei UI",
+ "Microsoft YaHei",
+ "Microsoft JhengHei UI",
+ "Microsoft JhengHei",
+ "Nirmala UI",
+ "Iskoola Pota",
2020-06-20 12:07:36 +02:00
+ "Ebrima",
"Arial Unicode MS",
0
};
static const char *ch_CN_tryFonts [] = {
- "SimSun",
+ "Microsoft YaHei UI",
+ "Microsoft YaHei",
"Arial",
- "PMingLiU",
- "Gulim",
- "MS UI Gothic",
+ "Microsoft JhengHei UI",
+ "Microsoft JhengHei",
+ "Malgun Gothic",
+ "Yu Gothic UI",
+ "Meiryo UI",
+ "Yu Gothic",
+ "Meiryo",
+ "Nirmala UI",
+ "Iskoola Pota",
2020-06-20 12:07:36 +02:00
+ "Ebrima",
"Arial Unicode MS",
0
};
static const char *ch_TW_tryFonts [] = {
- "PMingLiU",
+ "Microsoft JhengHei UI",
+ "Microsoft JhengHei",
"Arial",
- "SimSun",
- "Gulim",
- "MS UI Gothic",
+ "Microsoft YaHei UI",
+ "Microsoft YaHei",
+ "Malgun Gothic",
+ "Yu Gothic UI",
+ "Meiryo UI",
+ "Yu Gothic",
+ "Meiryo",
+ "Nirmala UI",
+ "Iskoola Pota",
2020-06-20 12:07:36 +02:00
+ "Ebrima",
"Arial Unicode MS",
0
};
static const char *kr_tryFonts[] = {
- "Gulim",
+ "Malgun Gothic",
"Arial",
- "PMingLiU",
- "SimSun",
- "MS UI Gothic",
+ "Microsoft JhengHei UI",
+ "Microsoft JhengHei",
+ "Microsoft YaHei UI",
+ "Microsoft YaHei",
+ "Yu Gothic UI",
+ "Meiryo UI",
+ "Yu Gothic",
+ "Meiryo",
+ "Nirmala UI",
+ "Iskoola Pota",
2020-06-20 12:07:36 +02:00
+ "Ebrima",
"Arial Unicode MS",
0
};