Some checks failed
Update All Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Triage Project Sync (#84) / Sync triage project (push) Has been cancelled
release_nightly / notify_on_failure (push) Has been cancelled
release_nightly / check_style (push) Has been cancelled
release_nightly / run_tests_windows (push) Has been cancelled
release_nightly / clippy_windows (push) Has been cancelled
release_nightly / bundle_linux_aarch64 (push) Has been cancelled
release_nightly / bundle_linux_x86_64 (push) Has been cancelled
release_nightly / bundle_mac_aarch64 (push) Has been cancelled
release_nightly / bundle_mac_x86_64 (push) Has been cancelled
release_nightly / bundle_windows_aarch64 (push) Has been cancelled
release_nightly / bundle_windows_x86_64 (push) Has been cancelled
release_nightly / build_nix_linux_x86_64 (push) Has been cancelled
release_nightly / build_nix_mac_aarch64 (push) Has been cancelled
release_nightly / update_nightly_tag (push) Has been cancelled
Hotfix Review Monitor / check-hotfix-reviews (push) Has been cancelled
Stale PR Review Reminder / check-stale-prs (push) Has been cancelled
Update Weekly Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Bump collab-staging Tag / update-collab-staging-tag (push) Has been cancelled
compliance_check / scheduled_compliance_check (push) Has been cancelled
Single-commit orphan branch: full zed-industries/zed @ 8c74db0 source tree with a 3-file patch applied (no upstream history). Patch (crates/gpui_linux/src/linux/wayland/): - serial.rs: add SerialKind::KeyboardEnter - client.rs: store wl_keyboard.enter serial; add latest_serial_of() - window.rs: activate() uses keyboard-enter serial (Mutter focus gate) Mutter honors window activation only when the token carries the keyboard- focus serial from wl_keyboard.enter; GPUI used a stale mouse-press serial. See docs/tray-window-focus-wayland.md in logiguard. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
332 lines
11 KiB
Rust
332 lines
11 KiB
Rust
use std::sync::Arc;
|
|
use std::{fmt::Debug, path::Path};
|
|
|
|
use anyhow::Result;
|
|
use collections::HashMap;
|
|
use gpui::{App, AssetSource, Global, SharedString};
|
|
use parking_lot::RwLock;
|
|
use thiserror::Error;
|
|
|
|
use crate::{
|
|
Appearance, AppearanceContent, ChevronIcons, DEFAULT_ICON_THEME_NAME, DirectoryIcons,
|
|
IconDefinition, IconTheme, IconThemeFamilyContent, Theme, ThemeFamily, default_icon_theme,
|
|
};
|
|
|
|
/// The metadata for a theme.
|
|
#[derive(Debug, Clone)]
|
|
pub struct ThemeMeta {
|
|
/// The name of the theme.
|
|
pub name: SharedString,
|
|
/// The appearance of the theme.
|
|
pub appearance: Appearance,
|
|
}
|
|
|
|
/// An error indicating that the theme with the given name was not found.
|
|
#[derive(Debug, Error, Clone)]
|
|
#[error("theme not found: {0}")]
|
|
pub struct ThemeNotFoundError(pub SharedString);
|
|
|
|
/// An error indicating that the icon theme with the given name was not found.
|
|
#[derive(Debug, Error, Clone)]
|
|
#[error("icon theme not found: {0}")]
|
|
pub struct IconThemeNotFoundError(pub SharedString);
|
|
|
|
/// The global [`ThemeRegistry`].
|
|
///
|
|
/// This newtype exists for obtaining a unique [`TypeId`](std::any::TypeId) when
|
|
/// inserting the [`ThemeRegistry`] into the context as a global.
|
|
///
|
|
/// This should not be exposed outside of this module.
|
|
#[derive(Default)]
|
|
struct GlobalThemeRegistry(Arc<ThemeRegistry>);
|
|
|
|
impl std::ops::DerefMut for GlobalThemeRegistry {
|
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
|
&mut self.0
|
|
}
|
|
}
|
|
|
|
impl std::ops::Deref for GlobalThemeRegistry {
|
|
type Target = Arc<ThemeRegistry>;
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
impl Global for GlobalThemeRegistry {}
|
|
|
|
struct ThemeRegistryState {
|
|
themes: HashMap<SharedString, Arc<Theme>>,
|
|
icon_themes: HashMap<SharedString, Arc<IconTheme>>,
|
|
/// Whether the extensions have been loaded yet.
|
|
extensions_loaded: bool,
|
|
}
|
|
|
|
/// The registry for themes.
|
|
pub struct ThemeRegistry {
|
|
state: RwLock<ThemeRegistryState>,
|
|
assets: Box<dyn AssetSource>,
|
|
}
|
|
|
|
impl ThemeRegistry {
|
|
/// Returns the global [`ThemeRegistry`].
|
|
pub fn global(cx: &App) -> Arc<Self> {
|
|
cx.global::<GlobalThemeRegistry>().0.clone()
|
|
}
|
|
|
|
/// Returns the global [`ThemeRegistry`].
|
|
///
|
|
/// Inserts a default [`ThemeRegistry`] if one does not yet exist.
|
|
pub fn default_global(cx: &mut App) -> Arc<Self> {
|
|
cx.default_global::<GlobalThemeRegistry>().0.clone()
|
|
}
|
|
|
|
/// Returns the global [`ThemeRegistry`] if it exists.
|
|
pub fn try_global(cx: &mut App) -> Option<Arc<Self>> {
|
|
cx.try_global::<GlobalThemeRegistry>().map(|t| t.0.clone())
|
|
}
|
|
|
|
/// Sets the global [`ThemeRegistry`].
|
|
pub(crate) fn set_global(assets: Box<dyn AssetSource>, cx: &mut App) {
|
|
cx.set_global(GlobalThemeRegistry(Arc::new(ThemeRegistry::new(assets))));
|
|
}
|
|
|
|
/// Returns the asset source used by this registry.
|
|
pub fn assets(&self) -> &dyn AssetSource {
|
|
self.assets.as_ref()
|
|
}
|
|
|
|
/// Creates a new [`ThemeRegistry`] with the given [`AssetSource`].
|
|
pub fn new(assets: Box<dyn AssetSource>) -> Self {
|
|
let registry = Self {
|
|
state: RwLock::new(ThemeRegistryState {
|
|
themes: HashMap::default(),
|
|
icon_themes: HashMap::default(),
|
|
extensions_loaded: false,
|
|
}),
|
|
assets,
|
|
};
|
|
|
|
// We're loading the Zed default theme, as we need a theme to be loaded
|
|
// for tests.
|
|
registry.insert_theme_families([crate::fallback_themes::zed_default_themes()]);
|
|
|
|
let default_icon_theme = crate::default_icon_theme();
|
|
registry
|
|
.state
|
|
.write()
|
|
.icon_themes
|
|
.insert(default_icon_theme.name.clone(), default_icon_theme);
|
|
|
|
registry
|
|
}
|
|
|
|
/// Returns whether the extensions have been loaded.
|
|
pub fn extensions_loaded(&self) -> bool {
|
|
self.state.read().extensions_loaded
|
|
}
|
|
|
|
/// Sets the flag indicating that the extensions have loaded.
|
|
pub fn set_extensions_loaded(&self) {
|
|
self.state.write().extensions_loaded = true;
|
|
}
|
|
|
|
/// Inserts the given theme families into the registry.
|
|
pub fn insert_theme_families(&self, families: impl IntoIterator<Item = ThemeFamily>) {
|
|
for family in families.into_iter() {
|
|
self.insert_themes(family.themes);
|
|
}
|
|
}
|
|
|
|
/// Registers theme families for use in tests.
|
|
#[cfg(any(test, feature = "test-support"))]
|
|
pub fn register_test_themes(&self, families: impl IntoIterator<Item = ThemeFamily>) {
|
|
self.insert_theme_families(families);
|
|
}
|
|
|
|
/// Registers icon themes for use in tests.
|
|
#[cfg(any(test, feature = "test-support"))]
|
|
pub fn register_test_icon_themes(&self, icon_themes: impl IntoIterator<Item = IconTheme>) {
|
|
let mut state = self.state.write();
|
|
for icon_theme in icon_themes {
|
|
state
|
|
.icon_themes
|
|
.insert(icon_theme.name.clone(), Arc::new(icon_theme));
|
|
}
|
|
}
|
|
|
|
/// Inserts the given themes into the registry.
|
|
pub fn insert_themes(&self, themes: impl IntoIterator<Item = Theme>) {
|
|
let mut state = self.state.write();
|
|
for theme in themes.into_iter() {
|
|
state.themes.insert(theme.name.clone(), Arc::new(theme));
|
|
}
|
|
}
|
|
|
|
/// Removes the themes with the given names from the registry.
|
|
pub fn remove_user_themes(&self, themes_to_remove: &[SharedString]) {
|
|
self.state
|
|
.write()
|
|
.themes
|
|
.retain(|name, _| !themes_to_remove.contains(name))
|
|
}
|
|
|
|
/// Removes all themes from the registry.
|
|
pub fn clear(&self) {
|
|
self.state.write().themes.clear();
|
|
}
|
|
|
|
/// Returns the names of all themes in the registry.
|
|
pub fn list_names(&self) -> Vec<SharedString> {
|
|
let mut names = self.state.read().themes.keys().cloned().collect::<Vec<_>>();
|
|
names.sort();
|
|
names
|
|
}
|
|
|
|
/// Returns the metadata of all themes in the registry.
|
|
pub fn list(&self) -> Vec<ThemeMeta> {
|
|
self.state
|
|
.read()
|
|
.themes
|
|
.values()
|
|
.map(|theme| ThemeMeta {
|
|
name: theme.name.clone(),
|
|
appearance: theme.appearance(),
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
/// Returns the theme with the given name.
|
|
pub fn get(&self, name: &str) -> Result<Arc<Theme>, ThemeNotFoundError> {
|
|
self.state
|
|
.read()
|
|
.themes
|
|
.get(name)
|
|
.ok_or_else(|| ThemeNotFoundError(name.to_string().into()))
|
|
.cloned()
|
|
}
|
|
|
|
/// Returns the default icon theme.
|
|
pub fn default_icon_theme(&self) -> Result<Arc<IconTheme>, IconThemeNotFoundError> {
|
|
self.get_icon_theme(DEFAULT_ICON_THEME_NAME)
|
|
}
|
|
|
|
/// Returns the metadata of all icon themes in the registry.
|
|
pub fn list_icon_themes(&self) -> Vec<ThemeMeta> {
|
|
self.state
|
|
.read()
|
|
.icon_themes
|
|
.values()
|
|
.map(|theme| ThemeMeta {
|
|
name: theme.name.clone(),
|
|
appearance: theme.appearance,
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
/// Returns the icon theme with the specified name.
|
|
pub fn get_icon_theme(&self, name: &str) -> Result<Arc<IconTheme>, IconThemeNotFoundError> {
|
|
self.state
|
|
.read()
|
|
.icon_themes
|
|
.get(name)
|
|
.ok_or_else(|| IconThemeNotFoundError(name.to_string().into()))
|
|
.cloned()
|
|
}
|
|
|
|
/// Removes the icon themes with the given names from the registry.
|
|
pub fn remove_icon_themes(&self, icon_themes_to_remove: &[SharedString]) {
|
|
self.state
|
|
.write()
|
|
.icon_themes
|
|
.retain(|name, _| !icon_themes_to_remove.contains(name))
|
|
}
|
|
|
|
/// Loads the icon theme from the icon theme family and adds it to the registry.
|
|
///
|
|
/// The `icons_root_dir` parameter indicates the root directory from which
|
|
/// the relative paths to icons in the theme should be resolved against.
|
|
pub fn load_icon_theme(
|
|
&self,
|
|
icon_theme_family: IconThemeFamilyContent,
|
|
icons_root_dir: &Path,
|
|
) -> Result<()> {
|
|
let resolve_icon_path = |path: SharedString| {
|
|
icons_root_dir
|
|
.join(path.as_ref())
|
|
.to_string_lossy()
|
|
.to_string()
|
|
.into()
|
|
};
|
|
|
|
let default_icon_theme = default_icon_theme();
|
|
|
|
let mut state = self.state.write();
|
|
for icon_theme in icon_theme_family.themes {
|
|
let mut file_stems = default_icon_theme.file_stems.clone();
|
|
file_stems.extend(icon_theme.file_stems);
|
|
|
|
let mut file_suffixes = default_icon_theme.file_suffixes.clone();
|
|
file_suffixes.extend(icon_theme.file_suffixes);
|
|
|
|
let mut named_directory_icons = default_icon_theme.named_directory_icons.clone();
|
|
named_directory_icons.extend(icon_theme.named_directory_icons.into_iter().map(
|
|
|(key, value)| {
|
|
(
|
|
key,
|
|
DirectoryIcons {
|
|
collapsed: value.collapsed.map(resolve_icon_path),
|
|
expanded: value.expanded.map(resolve_icon_path),
|
|
},
|
|
)
|
|
},
|
|
));
|
|
|
|
let icon_theme = IconTheme {
|
|
id: uuid::Uuid::new_v4().to_string(),
|
|
name: icon_theme.name.into(),
|
|
appearance: match icon_theme.appearance {
|
|
AppearanceContent::Light => Appearance::Light,
|
|
AppearanceContent::Dark => Appearance::Dark,
|
|
},
|
|
directory_icons: DirectoryIcons {
|
|
collapsed: icon_theme.directory_icons.collapsed.map(resolve_icon_path),
|
|
expanded: icon_theme.directory_icons.expanded.map(resolve_icon_path),
|
|
},
|
|
named_directory_icons,
|
|
chevron_icons: ChevronIcons {
|
|
collapsed: icon_theme.chevron_icons.collapsed.map(resolve_icon_path),
|
|
expanded: icon_theme.chevron_icons.expanded.map(resolve_icon_path),
|
|
},
|
|
file_stems,
|
|
file_suffixes,
|
|
file_icons: icon_theme
|
|
.file_icons
|
|
.into_iter()
|
|
.map(|(key, icon)| {
|
|
(
|
|
key,
|
|
IconDefinition {
|
|
path: resolve_icon_path(icon.path),
|
|
},
|
|
)
|
|
})
|
|
.collect(),
|
|
};
|
|
|
|
state
|
|
.icon_themes
|
|
.insert(icon_theme.name.clone(), Arc::new(icon_theme));
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
impl Default for ThemeRegistry {
|
|
fn default() -> Self {
|
|
Self::new(Box::new(()))
|
|
}
|
|
}
|