Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpui: Fix TextStyle default font_family crash on Windows, use Segoe UI for Windows (#14040)

Browse source 
Release Notes:

- Fixed default font_family crash on Windows, use `Segoe UI`.

## Crash error message

```
thread 'main' panicked at crates\gpui\src\text_system.rs:150:9:
failed to resolve font 'Helvetica' or any of the fallbacks: 
Zed Plex Mono, Helvetica, Cantarell, Ubuntu, Noto Sans, DejaVu Sans
```
This commit is contained in:
Jason Lee 2024-07-11 03:40:42 +08:00 • committed by GitHub
parent 1887a6db53
commit 15662f105e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/gpui/src/style.rs
View file

@ -212,6 +212,8 @@ impl Default for TextStyle {
// todo(linux) make this configurable or choose better default // todo(linux) make this configurable or choose better default
font_family: if cfg!(target_os = "linux") { font_family: if cfg!(target_os = "linux") {
"FreeMono".into() "FreeMono".into()
} else if cfg!(target_os = "windows") {
"Segoe UI".into()
} else { } else {
"Helvetica".into() "Helvetica".into()
}, },

1
crates/gpui/src/text_system.rs
View file

@ -66,6 +66,7 @@ impl TextSystem {
// We should allow GPUI users to provide their own fallback font stack. // We should allow GPUI users to provide their own fallback font stack.
font("Zed Plex Mono"), font("Zed Plex Mono"),
font("Helvetica"), font("Helvetica"),
font("Segoe UI"), // Windows
font("Cantarell"), // Gnome font("Cantarell"), // Gnome
font("Ubuntu"), // Gnome (Ubuntu) font("Ubuntu"), // Gnome (Ubuntu)
font("Noto Sans"), // KDE font("Noto Sans"), // KDE