From 87f8e4bd4bacbadf12b25c3786c86e711bfeba06 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Wed, 6 Mar 2024 15:26:22 -0500 Subject: [PATCH] fix(appearance): use picker button --- app/src/pages/desktop/appearance.rs | 34 +++++++++++++---------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/app/src/pages/desktop/appearance.rs b/app/src/pages/desktop/appearance.rs index d322a6a..d197890 100644 --- a/app/src/pages/desktop/appearance.rs +++ b/app/src/pages/desktop/appearance.rs @@ -1189,27 +1189,23 @@ pub fn mode_and_colors() -> Section { .add( settings::item::builder(&*descriptions[4]) .description(&*descriptions[5]) - .control( - if let Some(c) = page.container_background.get_applied_color() { - container(color_button( - Some(Message::ContainerBackground( + .control(if page.container_background.get_applied_color().is_some() { + Element::from( + page.container_background + .picker_button(Message::ContainerBackground, Some(24)) + .width(Length::Fixed(48.0)) + .height(Length::Fixed(24.0)), + ) + } else { + container( + button::text(fl!("auto")) + .trailing_icon(from_name("go-next-symbolic")) + .on_press(Message::ContainerBackground( ColorPickerUpdate::ToggleColorPicker, )), - c, - true, - 48, - 24, - )) - } else { - container( - button::text(fl!("auto")) - .trailing_icon(from_name("go-next-symbolic")) - .on_press(Message::ContainerBackground( - ColorPickerUpdate::ToggleColorPicker, - )), - ) - }, - ), + ) + .into() + }), ) .add( settings::item::builder(&*descriptions[8])