From 85367135d6b2010f90a5c2c00763af47c7bdf9f6 Mon Sep 17 00:00:00 2001
From: Monine Melolaris <monine@cyee.eu.org>
Date: Wed, 30 Aug 2023 13:28:03 +0800
Subject: [PATCH] FIX(client, theme): Chinese characters not displayed properly

This commit adds some font families to the default themes that improve the displaying of Chinese characters.

Added Windows(Microsoft YaHei), Linux(Noto Sans SC), Mac(PingFang SC) default Chinese fonts in the default theme's font-family, which can avoid the system calling fonts such as Simsun by default and bring bad display effect.
I put it in front of Arial and sans-serif, and behind other fonts, so as to avoid affecting the display of non-CJK fonts on the operating system.
---
 themes/Default/Dark.qss                             | 8 ++++----
 themes/Default/Lite.qss                             | 8 ++++----
 themes/Default/source/Imports/Dark Definitions.scss | 2 +-
 themes/Default/source/Imports/Lite Definitions.scss | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/themes/Default/Dark.qss b/themes/Default/Dark.qss
index c9f87dcd12e..136c38aefd5 100644
--- a/themes/Default/Dark.qss
+++ b/themes/Default/Dark.qss
@@ -49,7 +49,7 @@ QObject::handle,
 QObject::tab-bar,
 QObject::tab,
 QObject::section {
-  font-family: "Segoe UI", Frutiger, "Frutiger Linotype", "Dejavu Sans", "Helvetica Neue", Arial, sans-serif;
+  font-family: "Segoe UI", Frutiger, "Frutiger Linotype", "Dejavu Sans", "Helvetica Neue", "Microsoft YaHei UI", "PingFang SC", "Noto Sans SC", Arial, sans-serif;
   font-size: 10pt;
   margin: 0;
   padding: 0;
@@ -1066,15 +1066,15 @@ TalkingUI > * {
   background-color: #191919;
 }
 
-TalkingUI [selected="false"] {
+TalkingUI [selected=false] {
   background-color: #191919;
 }
 
-TalkingUI [selected="false"]:hover {
+TalkingUI [selected=false]:hover {
   background-color: #333;
 }
 
-TalkingUI [selected="true"] {
+TalkingUI [selected=true] {
   background-color: #3e4f5e;
   border: 1px solid #3e4f5e;
 }
diff --git a/themes/Default/Lite.qss b/themes/Default/Lite.qss
index 49bcff3cc76..ec0c19a4b63 100644
--- a/themes/Default/Lite.qss
+++ b/themes/Default/Lite.qss
@@ -49,7 +49,7 @@ QObject::handle,
 QObject::tab-bar,
 QObject::tab,
 QObject::section {
-  font-family: "Segoe UI", Frutiger, "Frutiger Linotype", "Dejavu Sans", "Helvetica Neue", Arial, sans-serif;
+  font-family: "Segoe UI", Frutiger, "Frutiger Linotype", "Dejavu Sans", "Helvetica Neue", "Microsoft YaHei UI", "PingFang SC", "Noto Sans SC", Arial, sans-serif;
   font-size: 10pt;
   margin: 0;
   padding: 0;
@@ -1066,15 +1066,15 @@ TalkingUI > * {
   background-color: #FFF;
 }
 
-TalkingUI [selected="false"] {
+TalkingUI [selected=false] {
   background-color: #FFF;
 }
 
-TalkingUI [selected="false"]:hover {
+TalkingUI [selected=false]:hover {
   background-color: #eee;
 }
 
-TalkingUI [selected="true"] {
+TalkingUI [selected=true] {
   background-color: #dcedf5;
   border: 1px solid #97b5c6;
 }
diff --git a/themes/Default/source/Imports/Dark Definitions.scss b/themes/Default/source/Imports/Dark Definitions.scss
index 7f6c3651fa8..c3cb2392d6d 100644
--- a/themes/Default/source/Imports/Dark Definitions.scss	
+++ b/themes/Default/source/Imports/Dark Definitions.scss	
@@ -73,7 +73,7 @@ $checkbox: url(skin:controls/checkbox_check_dark.svg);
 $checkbox-disabled: url(skin:controls/checkbox_check_disabled.svg);
 $link: #39a5dd;
 
-$font-family: "Segoe UI", Frutiger, "Frutiger Linotype", "Dejavu Sans", "Helvetica Neue", Arial, sans-serif;
+$font-family: "Segoe UI", Frutiger, "Frutiger Linotype", "Dejavu Sans", "Helvetica Neue", "Microsoft YaHei UI", "PingFang SC", "Noto Sans SC", Arial, sans-serif;
 $font-size-bigger: 13pt;
 $font-size-big: 12pt;
 $font-size-normal: 10pt;
diff --git a/themes/Default/source/Imports/Lite Definitions.scss b/themes/Default/source/Imports/Lite Definitions.scss
index 3084c9c2486..cd1f9976f01 100644
--- a/themes/Default/source/Imports/Lite Definitions.scss	
+++ b/themes/Default/source/Imports/Lite Definitions.scss	
@@ -73,7 +73,7 @@ $checkbox: url(skin:controls/checkbox_check_lite.svg);
 $checkbox-disabled: url(skin:controls/checkbox_check_disabled.svg);
 $link: #0b8eb2;
 
-$font-family: "Segoe UI", Frutiger, "Frutiger Linotype", "Dejavu Sans", "Helvetica Neue", Arial, sans-serif;
+$font-family: "Segoe UI", Frutiger, "Frutiger Linotype", "Dejavu Sans", "Helvetica Neue", "Microsoft YaHei UI", "PingFang SC", "Noto Sans SC", Arial, sans-serif;
 $font-size-bigger: 13pt;
 $font-size-big: 12pt;
 $font-size-normal: 10pt;