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

Remove ThemeColor in favor of theme2::Theme

Browse source
This commit is contained in:
Marshall Bowers 2023-10-25 16:32:44 +02:00
parent bb3f59252e
commit e1032c5341
42 changed files with 225 additions and 391 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ui2/src/prelude.rs
View file

@ -6,7 +6,7 @@ pub use gpui2::{
pub use crate::color::*;
pub use crate::elevation::*;
use crate::settings::user_settings;
pub use crate::{old_theme, ButtonVariant, ElementExt, Theme};
pub use crate::{old_theme, theme, ButtonVariant, ElementExt, Theme};
use gpui2::{rems, Hsla, Rems};
use strum::EnumIter;
@ -61,15 +61,15 @@ impl GitStatus {
}
pub fn hsla(&self, cx: &WindowContext) -> Hsla {
let color = ThemeColor::new(cx);
let theme = theme(cx);
match self {
Self::None => color.transparent,
Self::Created => color.git_created,
Self::Modified => color.git_modified,
Self::Deleted => color.git_deleted,
Self::Conflict => color.git_conflict,
Self::Renamed => color.git_renamed,
Self::None => theme.transparent,
Self::Created => theme.git_created,
Self::Modified => theme.git_modified,
Self::Deleted => theme.git_deleted,
Self::Conflict => theme.git_conflict,
Self::Renamed => theme.git_renamed,
}
}
}