From d8699721b7b03fa40952e8c91a3538c44a6309df Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 20 Mar 2025 22:09:01 -0500 Subject: [PATCH] small ui changes --- src/ui/library.rs | 53 +++++++++++++++++++-------------------------- src/ui/presenter.rs | 8 ++----- 2 files changed, 24 insertions(+), 37 deletions(-) diff --git a/src/ui/library.rs b/src/ui/library.rs index 345bd29..1607d2c 100644 --- a/src/ui/library.rs +++ b/src/ui/library.rs @@ -318,7 +318,7 @@ impl<'a> Library { .size(20), ); let row_container = - Container::new(row) + Container::new(row.align_y(Vertical::Center)) .padding(5) .style(|t| { container::Style::default() @@ -352,11 +352,10 @@ impl<'a> Library { }) .on_enter(Message::HoverLibrary(Some(model.kind))) .on_exit(Message::HoverLibrary(None)); - let lib_container = - if self.library_open == Some(model.kind) { - let items = scrollable( - column({ - model.items.iter().enumerate().map( + let lib_container = if self.library_open == Some(model.kind) { + let items = scrollable( + column({ + model.items.iter().enumerate().map( |(index, item)| { let service_item = item.to_service_item(); let visual_item = self @@ -397,31 +396,23 @@ impl<'a> Library { .into() }, ) - }) - .spacing(2) - .width(Length::Fill), - ) - .spacing(5); - - let library_toolbar = rowm!( - text_input("Search...", ""), - button::icon(icon::from_name("add")) - ); - let library_column = - column![library_toolbar, items].spacing(3); - - Container::new(library_column).padding(5).style(|t| { - container::Style::default() - .background(Background::Color( - t.cosmic().primary.base.into(), - )) - .border(Border::default().rounded( - t.cosmic().corner_radii.radius_m, - )) }) - } else { - Container::new(Space::new(0, 0)) - }; + .spacing(2) + .width(Length::Fill), + ) + .spacing(5); + + let library_toolbar = rowm!( + text_input("Search...", ""), + button::icon(icon::from_name("add")) + ); + let library_column = + column![library_toolbar, items].spacing(3); + + Container::new(library_column).padding(5) + } else { + Container::new(Space::new(0, 0)) + }; column![library_button, lib_container].into() } @@ -498,7 +489,7 @@ impl<'a> Library { )) .border( Border::default() - .rounded(t.cosmic().corner_radii.radius_l), + .rounded(t.cosmic().corner_radii.radius_m), ) }) .into() diff --git a/src/ui/presenter.rs b/src/ui/presenter.rs index f23427e..4aecffa 100644 --- a/src/ui/presenter.rs +++ b/src/ui/presenter.rs @@ -471,13 +471,9 @@ impl Presenter { .padding(10), ) .interaction(cosmic::iced::mouse::Interaction::Pointer) - .on_enter(Message::HoveredSlide(slide_id)) + .on_move(move |_| Message::HoveredSlide(slide_id)) .on_exit(Message::HoveredSlide(-1)) - .on_press({ - let id = - self.slides.iter().position(|s| s == slide).unwrap(); - Message::SlideChange(id as u16) - }); + .on_press(Message::SlideChange(slide_id as u16)); delegate.into() }