diff --git a/crates/ui2/src/color.rs b/crates/ui2/src/color.rs index dcca95ae96..dfc734a75e 100644 --- a/crates/ui2/src/color.rs +++ b/crates/ui2/src/color.rs @@ -1,4 +1,4 @@ -use crate::theme2; +use crate::theme; pub use crate::{old_theme, ButtonVariant, ElementExt, Theme}; use gpui2::{hsla, rgb, Hsla, WindowContext}; use strum::EnumIter; @@ -253,8 +253,7 @@ impl std::fmt::Debug for ThemeColor { impl ThemeColor { pub fn new(cx: &WindowContext) -> Self { - let theme = old_theme(cx); - let theme2 = theme2(cx); + let theme2 = theme(cx); let transparent = hsla(0.0, 0.0, 0.0, 0.0); let players = [ diff --git a/crates/ui2/src/theme.rs b/crates/ui2/src/theme.rs index e921019e70..e772fb2061 100644 --- a/crates/ui2/src/theme.rs +++ b/crates/ui2/src/theme.rs @@ -218,6 +218,6 @@ pub fn old_theme(cx: &WindowContext) -> Arc { Arc::new(cx.global::().clone()) } -pub fn theme2(cx: &WindowContext) -> Arc { +pub fn theme(cx: &WindowContext) -> Arc { cx.global::>().clone() }