Conrad Irwin
bd61eb0889
The Zed Plex fonts were found to violate the OFL by using the word Plex in the name. Lilex has better ligatures and box-drawing characters than Zed Plex Mono, but Zed Plex Sans should be identical to IBM Plex Sans. Closes #15542 Closes zed-industries/zed-fonts#31 Release Notes: - The "Zed Plex Sans" and "Zed Plex Mono" fonts have been replaced with "IBM Plex Sans" and "Lilex". The old names still work for backward compatibility. Other than fixing line-drawing characters, and improving the ligatures, there should be little visual change as the fonts are all of the same family. - Introduced ".ZedSans" and ".ZedMono" as aliases to allow us to easily change the default fonts in the future. These currently default to "IBM Plex Sans" and "Lilex" respectively.
66 lines
2.0 KiB
Rust
66 lines
2.0 KiB
Rust
// This crate was essentially pulled out verbatim from main `zed` crate to avoid having to run RustEmbed macro whenever zed has to be rebuilt. It saves a second or two on an incremental build.
|
|
|
|
use anyhow::Context as _;
|
|
use gpui::{App, AssetSource, Result, SharedString};
|
|
use rust_embed::RustEmbed;
|
|
|
|
#[derive(RustEmbed)]
|
|
#[folder = "../../assets"]
|
|
#[include = "fonts/**/*"]
|
|
#[include = "icons/**/*"]
|
|
#[include = "images/**/*"]
|
|
#[include = "themes/**/*"]
|
|
#[exclude = "themes/src/*"]
|
|
#[include = "sounds/**/*"]
|
|
#[include = "prompts/**/*"]
|
|
#[include = "*.md"]
|
|
#[exclude = "*.DS_Store"]
|
|
pub struct Assets;
|
|
|
|
impl AssetSource for Assets {
|
|
fn load(&self, path: &str) -> Result<Option<std::borrow::Cow<'static, [u8]>>> {
|
|
Self::get(path)
|
|
.map(|f| Some(f.data))
|
|
.with_context(|| format!("loading asset at path {path:?}"))
|
|
}
|
|
|
|
fn list(&self, path: &str) -> Result<Vec<SharedString>> {
|
|
Ok(Self::iter()
|
|
.filter_map(|p| {
|
|
if p.starts_with(path) {
|
|
Some(p.into())
|
|
} else {
|
|
None
|
|
}
|
|
})
|
|
.collect())
|
|
}
|
|
}
|
|
|
|
impl Assets {
|
|
/// Populate the [`TextSystem`] of the given [`AppContext`] with all `.ttf` fonts in the `fonts` directory.
|
|
pub fn load_fonts(&self, cx: &App) -> anyhow::Result<()> {
|
|
let font_paths = self.list("fonts")?;
|
|
let mut embedded_fonts = Vec::new();
|
|
for font_path in font_paths {
|
|
if font_path.ends_with(".ttf") {
|
|
let font_bytes = cx
|
|
.asset_source()
|
|
.load(&font_path)?
|
|
.expect("Assets should never return None");
|
|
embedded_fonts.push(font_bytes);
|
|
}
|
|
}
|
|
|
|
cx.text_system().add_fonts(embedded_fonts)
|
|
}
|
|
|
|
pub fn load_test_fonts(&self, cx: &App) {
|
|
cx.text_system()
|
|
.add_fonts(vec![
|
|
self.load("fonts/lilex/Lilex-Regular.ttf").unwrap().unwrap(),
|
|
])
|
|
.unwrap()
|
|
}
|
|
}
|