Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set default font to Noto Sans #618

Merged
merged 4 commits into from
Jan 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions res/default_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions scripts/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ Homepage: https://github.com/Riey/kime
Section: utils
Priority: optional
Architecture: %ARCH%
Recommends: fonts-noto-cjk
4 changes: 2 additions & 2 deletions src/engine/config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down