Nate Butler
ce848375fe
This PR pulls non-icon assets out of `ui::components::icon` in
preparation for icon standardization.
In the future icons will have standard names and sizes, and these image
assets won't conform to those constraints.
We can also add a `ui::components::image::Image` wrapper around the
`gpui::img` element in the future for any Zed-specific image styling we
want to enforce.
Of note:
```rust
#[derive(Debug, PartialEq, Eq, Copy, Clone, EnumIter, EnumString, IntoStaticStr, Serialize, Deserialize, DerivePathStr)]
#[strum(serialize_all = "snake_case")]
#[path_str(prefix = "images", suffix = ".svg")]
pub enum VectorName {
ZedLogo,
ZedXCopilot,
}
```
You can see in the above code we no longer need to manually specify
paths for image/icon enums like we currently do in
`ui::components::icon`.
The icon component will get this same treatment in the future, once we:
- do the design work needed to standardize the icons
- remove unused icons
- update icon names
Release Notes:
- N/A
67 lines
2.1 KiB
Rust
67 lines
2.1 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::anyhow;
|
|
|
|
use gpui::{AppContext, 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))
|
|
.ok_or_else(|| anyhow!("could not find 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: &AppContext) -> gpui::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: &AppContext) {
|
|
cx.text_system()
|
|
.add_fonts(vec![self
|
|
.load("fonts/plex-mono/ZedPlexMono-Regular.ttf")
|
|
.unwrap()
|
|
.unwrap()])
|
|
.unwrap()
|
|
}
|
|
}
|