dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

theme: Remove Theme::get_global, there have Theme::global method. (#458)

Browse source
This commit is contained in:
Jason Lee 2024-12-03 18:55:50 +08:00 committed by GitHub
parent ee38970d68
commit bdcf552ecf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 35 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
crates/ui/src/theme.rs
View file

@ -15,7 +15,7 @@ pub trait ActiveTheme {
impl ActiveTheme for AppContext { impl ActiveTheme for AppContext {
fn theme(&self) -> &Theme { fn theme(&self) -> &Theme {
Theme::get_global(self) Theme::global(self)
} }
} }
@ -365,9 +365,9 @@ impl ThemeColor {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Theme { pub struct Theme {
pub mode: ThemeMode,
colors: ThemeColor, colors: ThemeColor,
pub mode: ThemeMode,
pub font_family: SharedString, pub font_family: SharedString,
pub font_size: f32, pub font_size: f32,
pub radius: f32, pub radius: f32,
@ -392,8 +392,14 @@ impl DerefMut for Theme {
impl Global for Theme {} impl Global for Theme {}
impl Theme { impl Theme {
pub fn get_global(cx: &AppContext) -> &Self { /// Returns the global theme reference
cx.global::<Self>() pub fn global(cx: &AppContext) -> &Theme {
cx.global::<Theme>()
}
/// Returns the global theme mutable reference
pub fn global_mut(cx: &mut AppContext) -> &mut Theme {
cx.global_mut::<Theme>()
} }
/// Apply a mask color to the theme. /// Apply a mask color to the theme.
@ -470,6 +476,31 @@ impl Theme {
self.sidebar_primary = self.sidebar_primary.apply(mask_color); self.sidebar_primary = self.sidebar_primary.apply(mask_color);
self.sidebar_primary_foreground = self.sidebar_primary_foreground.apply(mask_color); self.sidebar_primary_foreground = self.sidebar_primary_foreground.apply(mask_color);
} }
/// Sync the theme with the system appearance
pub fn sync_system_appearance(cx: &mut AppContext) {
match cx.window_appearance() {
WindowAppearance::Dark | WindowAppearance::VibrantDark => {
Self::change(ThemeMode::Dark, cx)
}
WindowAppearance::Light | WindowAppearance::VibrantLight => {
Self::change(ThemeMode::Light, cx)
}
}
}
pub fn change(mode: ThemeMode, cx: &mut AppContext) {
let colors = match mode {
ThemeMode::Light => ThemeColor::light(),
ThemeMode::Dark => ThemeColor::dark(),
};
let mut theme = Theme::from(colors);
theme.mode = mode;
cx.set_global(theme);
cx.refresh();
}
} }
impl From<ThemeColor> for Theme { impl From<ThemeColor> for Theme {
@ -504,40 +535,3 @@ impl ThemeMode {
matches!(self, Self::Dark) matches!(self, Self::Dark)
} }
} }
impl Theme {
/// Sync the theme with the system appearance
pub fn sync_system_appearance(cx: &mut AppContext) {
match cx.window_appearance() {
WindowAppearance::Dark | WindowAppearance::VibrantDark => {
Self::change(ThemeMode::Dark, cx)
}
WindowAppearance::Light | WindowAppearance::VibrantLight => {
Self::change(ThemeMode::Light, cx)
}
}
}
pub fn change(mode: ThemeMode, cx: &mut AppContext) {
let colors = match mode {
ThemeMode::Light => ThemeColor::light(),
ThemeMode::Dark => ThemeColor::dark(),
};
let mut theme = Theme::from(colors);
theme.mode = mode;
cx.set_global(theme);
cx.refresh();
}
/// Returns the global theme reference
pub fn global(cx: &AppContext) -> &Theme {
cx.global::<Theme>()
}
/// Returns the global theme mutable reference
pub fn global_mut(cx: &mut AppContext) -> &mut Theme {
cx.global_mut::<Theme>()
}
}