chris/lumina-iced
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

better preview bar

Browse source
This commit is contained in:
Chris Cochrun 2024-12-06 22:19:20 -06:00
parent 6ec2e1b97b
commit 039d1043a3
3 changed files with 91 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,3 +1,5 @@
/target
.direnv
.sqlx
.env
data.db

17
src/main.rs
View file

@ -470,19 +470,10 @@ impl cosmic::Application for App {
let slide_preview = column![
Space::with_height(Length::Fill),
Responsive::new(|size| {
let height = size.width * 9.0 / 16.0;
Container::new(
Container::new(
self.presenter
.view()
.map(|m| Message::Present(m)),
self.presenter.view().map(|m| Message::Present(m)),
)
.height(height),
)
.align_bottom(Length::Fill)
.into()
}),
.align_bottom(Length::Fill),
Container::new(if self.presenter.video.is_some() {
row![
video_button_icon,
@ -552,11 +543,11 @@ impl cosmic::Application for App {
)
.clip(true)
.width(Length::Fill)
.center_y(100)
.center_y(120)
];
let element: Element<Message> = column.into();
element.debug(true)
element
}
// View for presentation

65
src/ui/presenter.rs
View file

@ -14,8 +14,8 @@ use cosmic::{
prelude::*,
widget::{
canvas::path::lyon_path::geom::euclid::num::Floor, container,
image, mouse_area, scrollable, Container, Responsive, Row,
Space,
image, mouse_area, responsive, scrollable, Container,
Responsive, Row, Space,
},
Task,
};
@ -171,6 +171,7 @@ impl Presenter {
}
pub fn view(&self) -> Element<Message> {
responsive(|size| {
let family = Family::Name("VictorMono Nerd Font");
let weight = Weight::Normal;
let stretch = Stretch::Normal;
@ -181,7 +182,6 @@ impl Presenter {
stretch,
style,
};
let text = Responsive::new(move |size| {
let font_size = if self.current_slide.font_size() > 0 {
(size.width / self.current_slide.font_size() as f32)
* 3.0
@ -192,21 +192,22 @@ impl Presenter {
.size(font_size)
.font(font);
let text = Container::new(text).center(Length::Fill);
text.into()
});
let black = Container::new(Space::new(0, 0))
.style(|_| {
container::background(Background::Color(Color::BLACK))
container::background(Background::Color(
Color::BLACK,
))
})
.width(Length::Fill)
.height(Length::Fill);
let container = match self.current_slide.background().kind {
let container = match self.current_slide.background().kind
{
crate::BackgroundKind::Image => {
let path =
self.current_slide.background().path.clone();
Container::new(
image(path)
.content_fit(ContentFit::Contain)
.content_fit(ContentFit::Cover)
.width(Length::Fill)
.height(Length::Fill),
)
@ -227,8 +228,10 @@ impl Presenter {
}
};
stack!(black, container.center(Length::Fill), text)
.width(Length::Fill)
.height(Length::Fill)
.width(size.width)
.height(size.width * 9.0 / 16.0)
.into()
})
.into()
}
@ -245,27 +248,50 @@ impl Presenter {
row.into()
}
fn slide_delegate(&self, slide: &Slide) -> Element<Message> {
let font_size = if slide.font_size() > 0 {
slide.font_size() as u16
} else {
50
fn slide_delegate<'a>(
&'a self,
slide: &'a Slide,
) -> Element<'a, Message> {
let family = Family::Name("VictorMono Nerd Font");
let weight = Weight::Normal;
let stretch = Stretch::Normal;
let style = Style::Normal;
let font = Font {
family,
weight,
stretch,
style,
};
let text = text(slide.text()).size(font_size);
let text = Responsive::new(move |size| {
let font_size = if slide.font_size() > 0 {
(size.width / slide.font_size() as f32) * 3.0
} else {
50.0
};
let text = text(slide.text()).size(font_size).font(font);
let text = Container::new(text).center(Length::Fill);
text.into()
});
let container = match slide.background().kind {
crate::BackgroundKind::Image => {
let path = slide.background().path.clone();
Container::new(
image(path)
.content_fit(ContentFit::Cover)
.content_fit(ContentFit::Contain)
.width(Length::Fill)
.height(Length::Fill),
)
}
crate::BackgroundKind::Video => {
Container::new(Space::new(Length::Fill, Length::Fill))
Container::new(Space::new(0, 0))
.style(|_| {
container::background(Background::Color(
Color::BLACK,
))
})
.width(Length::Fill)
.height(Length::Fill)
}
};
let delegate = mouse_area(
@ -274,9 +300,8 @@ impl Presenter {
.width(Length::Fill)
.height(Length::Fill),
)
.center(Length::Fill)
.height(100)
.width(100)
.width(100.0 * 16.0 / 9.0)
.padding(10),
)
.on_press({