From fd324ea770b15d4f982295fc5ea9bbc862cc5faa Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Sat, 16 Mar 2024 00:10:42 +0100 Subject: [PATCH 1/3] improv: use destructive style for task delete icon button --- src/content.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/content.rs b/src/content.rs index 7db3afc..d87921c 100644 --- a/src/content.rs +++ b/src/content.rs @@ -81,6 +81,7 @@ impl Content { let delete_button = widget::icon::from_name("user-trash-full-symbolic") .size(16) .apply(widget::button::icon) + .style(cosmic::theme::Button::Destructive) .on_press(Message::Delete(item.id.clone())); let row = widget::row::with_capacity(3) @@ -91,9 +92,9 @@ impl Content { .push(delete_button); let button = widget::button(row) + .padding([0, 18]) .width(Length::Fill) .height(Length::Shrink) - .style(cosmic::theme::Button::Image) .style(button_style(false, true)) .on_press(Message::Select(item.clone())); From 372a07bed2808f5e826e42b5693ac821734bf6d2 Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Sat, 16 Mar 2024 00:14:52 +0100 Subject: [PATCH 2/3] improv: use text button for due date button --- src/details.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/details.rs b/src/details.rs index 273000f..6ebb6fd 100644 --- a/src/details.rs +++ b/src/details.rs @@ -191,7 +191,7 @@ impl Details { ) .add( widget::settings::item::builder(fl!("due-date")).control( - widget::button(widget::text(if self.due_date.is_some() { + widget::button::text(if self.due_date.is_some() { self.due_date .as_ref() .unwrap() @@ -199,7 +199,7 @@ impl Details { .to_string() } else { fl!("select-date") - })) + }) .on_press(Message::OpenCalendarDialog), ), ) From 210fce21649253e9725f76346f8b645d60d2315b Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Sat, 16 Mar 2024 00:27:55 +0100 Subject: [PATCH 3/3] improv: fix padding of list items --- src/content.rs | 6 ++++-- src/details.rs | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/content.rs b/src/content.rs index d87921c..550b928 100644 --- a/src/content.rs +++ b/src/content.rs @@ -65,7 +65,9 @@ impl Content { } pub fn list_view<'a>(&'a self, list: &'a List) -> Element<'a, Message> { - let cosmic_theme::Spacing { space_xxs, .. } = theme::active().cosmic().spacing; + let cosmic_theme::Spacing { + space_xxs, space_m, .. + } = theme::active().cosmic().spacing; if self.tasks.is_empty() { return self.empty(list); @@ -92,7 +94,7 @@ impl Content { .push(delete_button); let button = widget::button(row) - .padding([0, 18]) + .padding([space_xxs, space_m]) .width(Length::Fill) .height(Length::Shrink) .style(button_style(false, true)) diff --git a/src/details.rs b/src/details.rs index 6ebb6fd..b74a3cb 100644 --- a/src/details.rs +++ b/src/details.rs @@ -185,6 +185,7 @@ impl Details { .add( widget::settings::item::builder(fl!("priority")).control( widget::segmented_control::horizontal(&self.priority_model) + .button_alignment(Alignment::Center) .width(Length::Shrink) .on_activate(Message::PriorityActivate), ),