small ui changes
This commit is contained in:
parent
54de7eea8c
commit
d8699721b7
|
@ -318,7 +318,7 @@ impl<'a> Library {
|
||||||
.size(20),
|
.size(20),
|
||||||
);
|
);
|
||||||
let row_container =
|
let row_container =
|
||||||
Container::new(row)
|
Container::new(row.align_y(Vertical::Center))
|
||||||
.padding(5)
|
.padding(5)
|
||||||
.style(|t| {
|
.style(|t| {
|
||||||
container::Style::default()
|
container::Style::default()
|
||||||
|
@ -352,11 +352,10 @@ impl<'a> Library {
|
||||||
})
|
})
|
||||||
.on_enter(Message::HoverLibrary(Some(model.kind)))
|
.on_enter(Message::HoverLibrary(Some(model.kind)))
|
||||||
.on_exit(Message::HoverLibrary(None));
|
.on_exit(Message::HoverLibrary(None));
|
||||||
let lib_container =
|
let lib_container = if self.library_open == Some(model.kind) {
|
||||||
if self.library_open == Some(model.kind) {
|
let items = scrollable(
|
||||||
let items = scrollable(
|
column({
|
||||||
column({
|
model.items.iter().enumerate().map(
|
||||||
model.items.iter().enumerate().map(
|
|
||||||
|(index, item)| {
|
|(index, item)| {
|
||||||
let service_item = item.to_service_item();
|
let service_item = item.to_service_item();
|
||||||
let visual_item = self
|
let visual_item = self
|
||||||
|
@ -397,31 +396,23 @@ impl<'a> Library {
|
||||||
.into()
|
.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 {
|
.spacing(2)
|
||||||
Container::new(Space::new(0, 0))
|
.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()
|
column![library_button, lib_container].into()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -498,7 +489,7 @@ impl<'a> Library {
|
||||||
))
|
))
|
||||||
.border(
|
.border(
|
||||||
Border::default()
|
Border::default()
|
||||||
.rounded(t.cosmic().corner_radii.radius_l),
|
.rounded(t.cosmic().corner_radii.radius_m),
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.into()
|
.into()
|
||||||
|
|
|
@ -471,13 +471,9 @@ impl Presenter {
|
||||||
.padding(10),
|
.padding(10),
|
||||||
)
|
)
|
||||||
.interaction(cosmic::iced::mouse::Interaction::Pointer)
|
.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_exit(Message::HoveredSlide(-1))
|
||||||
.on_press({
|
.on_press(Message::SlideChange(slide_id as u16));
|
||||||
let id =
|
|
||||||
self.slides.iter().position(|s| s == slide).unwrap();
|
|
||||||
Message::SlideChange(id as u16)
|
|
||||||
});
|
|
||||||
delegate.into()
|
delegate.into()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue