Set default font to Noto Sans (#618)

* Set default font to Noto Sans * Make D2Coding to fallback font * Update CHANGELOG.md * Add font to `Recommends` for deb package
Riey · Jan 16, 2023 · eb4aad1 · eb4aad1
1 parent 695c148
commit eb4aad1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -9,6 +9,7 @@
 * Update configuration.md
 * Correct scan code to properly recognize F11 and F12 key
 * Fix KDE plasmashell crash #609
+* Set default font to `Noto Sans CJK KR`
 
 ## 3.0.1
 

diff --git a/res/default_config.yaml b/res/default_config.yaml
@@ -74,9 +74,9 @@ engine:
       Tab:
         behavior: Commit
         result: ConsumeIfProcessed
-  candidate_font: D2Coding
+  candidate_font: Noto Sans CJK KR
   xim_preedit_font:
-  - D2Coding
+  - Noto Sans CJK KR
   - 15.0
   latin:
     layout: Qwerty

diff --git a/scripts/control.in b/scripts/control.in
@@ -6,3 +6,4 @@ Homepage: https://github.com/Riey/kime
 Section: utils
 Priority: optional
 Architecture: %ARCH%
+Recommends: fonts-noto-cjk
diff --git a/src/engine/config/src/lib.rs b/src/engine/config/src/lib.rs
@@ -188,8 +188,8 @@ impl Default for EngineConfig {
                     Key::normal(KeyCode::Tab) => Hotkey::new(HotkeyBehavior::Commit, HotkeyResult::ConsumeIfProcessed),
                 },
             },
-            xim_preedit_font: ("D2Coding".to_string(), 15.0),
-            candidate_font: "D2Coding".to_string(),
+            xim_preedit_font: ("Noto Sans CJK KR".to_string(), 15.0),
+            candidate_font: "Noto Sans CJK KR".to_string(),
         }
     }
 }

diff --git a/src/engine/core/src/config.rs b/src/engine/core/src/config.rs
@@ -30,7 +30,7 @@ impl Config {
 
         let load_font = |name| {
             db.query(&Query {
-                families: &[Family::Name(name), Family::Serif],
+                families: &[Family::Name(name), Family::Name("D2Coding")],
                 ..Default::default()
             })
             .and_then(|id| db.with_face_data(id, |data, index| (data.to_vec(), index)))