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

Merge ea769b3d7b into a102b08743

Browse source
This commit is contained in:
Jason Lee 2025-08-25 12:19:43 -04:00 • committed by GitHub
commit 03b2f22051
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/gpui/examples/data_table.rs
View file

@ -374,7 +374,6 @@ impl DataTable {
impl Render for DataTable { impl Render for DataTable {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement { fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
div() div()
.font_family(".SystemUIFont")
.bg(gpui::white()) .bg(gpui::white())
.text_sm() .text_sm()
.size_full() .size_full()

1
crates/gpui/examples/gradient.rs
View file

@ -20,7 +20,6 @@ impl Render for GradientViewer {
let color_space = self.color_space; let color_space = self.color_space;
div() div()
.font_family(".SystemUIFont")
.bg(gpui::white()) .bg(gpui::white())
.size_full() .size_full()
.p_4() .p_4()

2
crates/gpui/examples/image_gallery.rs
View file

@ -47,7 +47,6 @@ impl Render for ImageGallery {
div() div()
.image_cache(self.image_cache.clone()) .image_cache(self.image_cache.clone())
.id("main") .id("main")
.font_family(".SystemUIFont")
.text_color(gpui::black()) .text_color(gpui::black())
.bg(rgb(0xE9E9E9)) .bg(rgb(0xE9E9E9))
.overflow_y_scroll() .overflow_y_scroll()
@ -102,7 +101,6 @@ impl Render for ImageGallery {
.child(image_cache(simple_lru_cache("lru-cache", IMAGES_IN_GALLERY)).child( .child(image_cache(simple_lru_cache("lru-cache", IMAGES_IN_GALLERY)).child(
div() div()
.id("main") .id("main")
.font_family(".SystemUIFont")
.bg(rgb(0xE9E9E9)) .bg(rgb(0xE9E9E9))
.text_color(gpui::black()) .text_color(gpui::black())
.overflow_y_scroll() .overflow_y_scroll()

1
crates/gpui/examples/painting.rs
View file

@ -328,7 +328,6 @@ impl Render for PaintingViewer {
let dashed = self.dashed; let dashed = self.dashed;
div() div()
.font_family(".SystemUIFont")
.bg(gpui::white()) .bg(gpui::white())
.size_full() .size_full()
.p_4() .p_4()

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

@ -403,13 +403,7 @@ impl Default for TextStyle {
TextStyle { TextStyle {
color: black(), color: black(),
// todo(linux) make this configurable or choose better default // todo(linux) make this configurable or choose better default
font_family: if cfg!(any(target_os = "linux", target_os = "freebsd")) { font_family: ".SystemUIFont".into(),
"FreeMono".into()
} else if cfg!(target_os = "windows") {
"Segoe UI".into()
} else {
"Helvetica".into()
},
font_features: FontFeatures::default(), font_features: FontFeatures::default(),
font_fallbacks: None, font_fallbacks: None,
font_size: rems(1.).into(), font_size: rems(1.).into(),

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

@ -67,11 +67,13 @@ impl TextSystem {
// TODO: Remove this when Linux have implemented setting fallbacks. // TODO: Remove this when Linux have implemented setting fallbacks.
font(".ZedMono"), font(".ZedMono"),
font("Helvetica"), font("Helvetica"),
font("Segoe UI"), // Windows font("Segoe UI"), // Windows
font("Cantarell"), // Gnome font("Ubuntu"), // Gnome (Ubuntu)
font("Ubuntu"), // Gnome (Ubuntu) font("Adwaita Sans"), // Gnome 47
font("Noto Sans"), // KDE font("Cantarell"), // Gnome
font("DejaVu Sans") font("Noto Sans"), // KDE
font("DejaVu Sans"),
font("Arial"), // macOS, Windows
], ],
} }
} }