mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-11 21:00:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Rename theme2 getter to theme

Browse source
This commit is contained in:
Marshall Bowers 2023-10-25 16:04:49 +02:00
parent 258496700f
commit bb3f59252e
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/ui2/src/color.rs
View file

@ -1,4 +1,4 @@
use crate::theme2; use crate::theme;
pub use crate::{old_theme, ButtonVariant, ElementExt, Theme}; pub use crate::{old_theme, ButtonVariant, ElementExt, Theme};
use gpui2::{hsla, rgb, Hsla, WindowContext}; use gpui2::{hsla, rgb, Hsla, WindowContext};
use strum::EnumIter; use strum::EnumIter;
@ -253,8 +253,7 @@ impl std::fmt::Debug for ThemeColor {
impl ThemeColor { impl ThemeColor {
pub fn new(cx: &WindowContext) -> Self { pub fn new(cx: &WindowContext) -> Self {
let theme = old_theme(cx); let theme2 = theme(cx);
let theme2 = theme2(cx);
let transparent = hsla(0.0, 0.0, 0.0, 0.0); let transparent = hsla(0.0, 0.0, 0.0, 0.0);
let players = [ let players = [

2
crates/ui2/src/theme.rs
View file

@ -218,6 +218,6 @@ pub fn old_theme(cx: &WindowContext) -> Arc<Theme> {
Arc::new(cx.global::<Theme>().clone()) Arc::new(cx.global::<Theme>().clone())
} }
pub fn theme2(cx: &WindowContext) -> Arc<theme2::Theme> { pub fn theme(cx: &WindowContext) -> Arc<theme2::Theme> {
cx.global::<Arc<theme2::Theme>>().clone() cx.global::<Arc<theme2::Theme>>().clone()
} }