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

linux: enable test TextSystem (#9037)

Browse source 
Make text tests work on linux.
This commit is contained in:
Rom Grk 2024-03-07 18:51:52 -05:00 • committed by GitHub
parent a90a667fd0
commit 2d83580df4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/gpui/src/platform/test.rs
View file

@ -7,6 +7,6 @@ mod window;
pub(crate) use dispatcher::*; pub(crate) use dispatcher::*;
pub(crate) use display::*; pub(crate) use display::*;
pub(crate) use platform::*; pub(crate) use platform::*;
#[cfg(not(target_os = "macos"))] #[cfg(target_os = "windows")]
pub(crate) use text_system::*; pub(crate) use text_system::*;
pub(crate) use window::*; pub(crate) use window::*;

2
crates/gpui/src/platform/test/platform.rs
View file

@ -121,7 +121,7 @@ impl Platform for TestPlatform {
fn text_system(&self) -> Arc<dyn PlatformTextSystem> { fn text_system(&self) -> Arc<dyn PlatformTextSystem> {
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
return Arc::new(crate::platform::test::TestTextSystem {}); return Arc::new(crate::platform::linux::LinuxTextSystem::new());
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
return Arc::new(crate::platform::mac::MacTextSystem::new()); return Arc::new(crate::platform::mac::MacTextSystem::new());

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

@ -63,7 +63,10 @@ impl TextSystem {
// TODO: This is currently Zed-specific. // TODO: This is currently Zed-specific.
// 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 Mono"), font("Zed Mono"),
font("Helvetica") font("Helvetica"),
font("Cantarell"), // Gnome
font("Ubuntu"), // Gnome (Ubuntu)
font("Noto Sans"), // KDE
], ],
} }
} }