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

theme: Rename title_bar_background to title_bar. (#382)

Browse source 
Use same name rule as other theme variables.
This commit is contained in:
Jason Lee 2024-10-30 14:25:21 +08:00 committed by GitHub
parent 0b0fc61c2f
commit 292d1a6a9a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -143,7 +143,7 @@ impl Colorize for Hsla {
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
struct Colors { struct Colors {
pub title_bar_background: Hsla, pub title_bar: Hsla,
pub title_bar_border: Hsla, pub title_bar_border: Hsla,
pub background: Hsla, pub background: Hsla,
pub foreground: Hsla, pub foreground: Hsla,
@ -185,7 +185,7 @@ struct Colors {
impl Colors { impl Colors {
fn light() -> Colors { fn light() -> Colors {
Colors { Colors {
title_bar_background: hsl(0.0, 0.0, 100.), title_bar: hsl(0.0, 0.0, 100.),
title_bar_border: hsl(240.0, 5.9, 90.0), title_bar_border: hsl(240.0, 5.9, 90.0),
background: hsl(0.0, 0.0, 100.), background: hsl(0.0, 0.0, 100.),
foreground: hsl(240.0, 10., 3.9), foreground: hsl(240.0, 10., 3.9),
@ -227,7 +227,7 @@ impl Colors {
fn dark() -> Colors { fn dark() -> Colors {
Colors { Colors {
title_bar_background: hsl(0., 0., 9.7), title_bar: hsl(0., 0., 9.7),
title_bar_border: hsl(240.0, 3.7, 15.9), title_bar_border: hsl(240.0, 3.7, 15.9),
background: hsl(0.0, 0.0, 8.0), background: hsl(0.0, 0.0, 8.0),
foreground: hsl(0., 0., 78.), foreground: hsl(0., 0., 78.),
@ -272,7 +272,7 @@ impl Colors {
pub struct Theme { pub struct Theme {
pub mode: ThemeMode, pub mode: ThemeMode,
pub transparent: Hsla, pub transparent: Hsla,
pub title_bar_background: Hsla, pub title_bar: Hsla,
pub title_bar_border: Hsla, pub title_bar_border: Hsla,
/// Basic font size /// Basic font size
pub font_size: f32, pub font_size: f32,
@ -350,7 +350,7 @@ impl Theme {
} }
pub fn apply_color(&mut self, mask_color: Hsla) { pub fn apply_color(&mut self, mask_color: Hsla) {
self.title_bar_background = self.title_bar_background.apply(mask_color); self.title_bar = self.title_bar.apply(mask_color);
self.title_bar_border = self.title_bar_border.apply(mask_color); self.title_bar_border = self.title_bar_border.apply(mask_color);
self.background = self.background.apply(mask_color); self.background = self.background.apply(mask_color);
self.foreground = self.foreground.apply(mask_color); self.foreground = self.foreground.apply(mask_color);
@ -430,7 +430,7 @@ impl From<Colors> for Theme {
}, },
radius: 4.0, radius: 4.0,
shadow: true, shadow: true,
title_bar_background: colors.title_bar_background, title_bar: colors.title_bar,
title_bar_border: colors.title_bar_border, title_bar_border: colors.title_bar_border,
background: colors.background, background: colors.background,
foreground: colors.foreground, foreground: colors.foreground,

2
crates/ui/src/title_bar.rs
View file

@ -208,7 +208,7 @@ impl RenderOnce for TitleBar {
}) })
.border_b_1() .border_b_1()
.border_color(cx.theme().title_bar_border) .border_color(cx.theme().title_bar_border)
.bg(cx.theme().title_bar_background) .bg(cx.theme().title_bar)
.on_double_click(|_, cx| cx.zoom_window()) .on_double_click(|_, cx| cx.zoom_window())
.child( .child(
h_flex() h_flex()