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

better design of slides
Some checks are pending
/ test (push) Waiting to run
Details

Browse source
This commit is contained in:
Chris Cochrun 2025-08-18 14:05:42 -05:00
parent f662e57c8f
commit 84c105a0f4
2 changed files with 230 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main.rs
View file

@ -1037,7 +1037,7 @@ impl cosmic::Application for App {
) )
.clip(true) .clip(true)
.width(Length::Fill) .width(Length::Fill)
.center_y(130) .center_y(180)
]; ];
if let Some(_editor) = &self.editor_mode { if let Some(_editor) = &self.editor_mode {

357
src/ui/presenter.rs
View file

@ -17,6 +17,7 @@ use cosmic::{
}, },
span, stack, span, stack,
text::Rich, text::Rich,
vertical_rule,
}, },
prelude::*, prelude::*,
widget::{ widget::{
@ -45,16 +46,15 @@ const REFERENCE_HEIGHT: f32 = 1080.0;
// #[derive(Default, Clone, Debug)] // #[derive(Default, Clone, Debug)]
pub(crate) struct Presenter { pub(crate) struct Presenter {
pub slides: Vec<Slide>,
pub service: Vec<ServiceItem>, pub service: Vec<ServiceItem>,
pub current_slide: Slide, pub current_slide: Slide,
pub current_item: usize, pub current_item: usize,
pub current_slide_index: u16, pub current_slide_index: usize,
pub video: Option<Video>, pub video: Option<Video>,
pub video_position: f32, pub video_position: f32,
pub audio: Option<PathBuf>, pub audio: Option<PathBuf>,
sink: (OutputStream, Arc<Sink>), sink: (OutputStream, Arc<Sink>),
hovered_slide: i32, hovered_slide: Option<(usize, usize)>,
scroll_id: Id, scroll_id: Id,
current_font: Font, current_font: Font,
} }
@ -78,7 +78,7 @@ pub(crate) enum Message {
VideoPos(f32), VideoPos(f32),
VideoFrame, VideoFrame,
MissingPlugin(gstreamer::Message), MissingPlugin(gstreamer::Message),
HoveredSlide(i32), HoveredSlide(Option<(usize, usize)>),
ChangeFont(String), ChangeFont(String),
Error(String), Error(String),
None, None,
@ -124,27 +124,25 @@ impl Presenter {
} }
pub fn with_items(items: Vec<ServiceItem>) -> Self { pub fn with_items(items: Vec<ServiceItem>) -> Self {
let mut slides = vec![];
for item in &items {
for slide in item.to_slides().unwrap_or_default() {
slides.push(slide);
}
}
let video = { let video = {
if let Some(slide) = slides.first() { if let Some(item) = items.first() {
let path = slide.background().path.clone(); if let Some(slide) = item.slides.first() {
if path.exists() { let path = slide.background().path.clone();
let url = Url::from_file_path(path).unwrap(); if path.exists() {
let result = Video::new(&url); let url = Url::from_file_path(path).unwrap();
match result { let result = Video::new(&url);
Ok(mut v) => { match result {
v.set_paused(true); Ok(mut v) => {
Some(v) v.set_paused(true);
} Some(v)
Err(e) => { }
error!("Had an error creating the video object: {e}, likely the first slide isn't a video"); Err(e) => {
None error!("Had an error creating the video object: {e}, likely the first slide isn't a video");
None
}
} }
} else {
None
} }
} else { } else {
None None
@ -154,15 +152,14 @@ impl Presenter {
} }
}; };
Self { Self {
slides: slides.clone(), current_slide: items[0].slides[0].clone(),
service: items,
current_slide: slides[0].clone(),
current_item: 0, current_item: 0,
current_slide_index: 0, current_slide_index: 0,
video, video,
audio: slides[0].audio(), audio: items[0].slides[0].audio().clone(),
service: items,
video_position: 0.0, video_position: 0.0,
hovered_slide: -1, hovered_slide: None,
sink: { sink: {
let (stream, stream_handle) = let (stream, stream_handle) =
OutputStream::try_default().unwrap(); OutputStream::try_default().unwrap();
@ -416,113 +413,217 @@ impl Presenter {
pub fn preview_bar(&self) -> Element<Message> { pub fn preview_bar(&self) -> Element<Message> {
let mut items = vec![]; let mut items = vec![];
// for item in &self.service { self.service.iter().enumerate().for_each(
// let mut slides = vec![]; |(item_index, item)| {
// for slide in item.slides.iter() { let mut slides = vec![];
// slides.push(self.slide_delegate(slide)); item.slides.iter().enumerate().for_each(
// } |(slide_index, slide)| {
let font_name = slide.font().into_boxed_str();
let family =
Family::Name(Box::leak(font_name));
let weight = Weight::Normal;
let stretch = Stretch::Normal;
let style = Style::Normal;
let font = Font {
family,
weight,
stretch,
style,
};
// let row = scrollable( let is_current_slide =
// Row::from_vec(slides).spacing(10).padding(15), (item_index, slide_index)
// ) == (
// .direction(Direction::Horizontal(Scrollbar::new())) self.current_item,
// .height(Length::Fill) self.current_slide_index,
// .width(Length::Fill) );
// .id(self.scroll_id.clone());
// let label = let container = slide_view(
// text::body(item.title.clone()).line_height(5.0); slide.clone(),
// let label_container = &self.video,
// container(horizontal_space().width(Length::Shrink)) font,
// .align_left(Length::Fill) true,
// .align_top(Length::Fill) false,
// .padding([3, 0, 0, 10]); );
// items.push(stack!(row, label_container).into()); let delegate = mouse_area(
// } Container::new(container)
for slide in self.slides.iter() { .style(move |t| {
items.push(self.slide_delegate(slide)); let mut style =
} container::Style::default();
let theme = t.cosmic();
let hovered = self.hovered_slide
== Some((
item_index,
slide_index,
));
style.background =
Some(Background::Color(
if is_current_slide {
theme
.accent
.base
.into()
} else if hovered {
theme
.accent
.hover
.into()
} else {
theme
.palette
.neutral_3
.into()
},
));
style.border = Border::default()
.rounded(10.0);
style.shadow = Shadow {
color: Color::BLACK,
offset: {
if is_current_slide {
Vector::new(5.0, 5.0)
} else if hovered {
Vector::new(5.0, 5.0)
} else {
Vector::new(0.0, 0.0)
}
},
blur_radius: {
if is_current_slide {
10.0
} else if hovered {
10.0
} else {
0.0
}
},
};
style
})
.center_x(100.0 * 16.0 / 9.0)
.height(100)
.padding(10),
)
.interaction(
cosmic::iced::mouse::Interaction::Pointer,
)
.on_move(move |_| {
Message::HoveredSlide(Some((
item_index,
slide_index,
)))
})
.on_exit(Message::HoveredSlide(None))
.on_press(Message::SlideChange(
slide.clone(),
));
slides.push(delegate.into());
},
);
let row = Row::from_vec(slides)
.spacing(10)
.padding([20, 15]);
let label = text::body(item.title.clone());
let label_container = container(label)
.align_top(Length::Fill)
.align_left(Length::Fill)
.padding([0, 0, 0, 35]);
let divider = vertical_rule(2);
items.push(
container(stack!(row, label_container))
.padding([5, 2])
.into(),
);
items.push(divider.into());
},
);
let row = let row =
scrollable(Row::from_vec(items).spacing(10).padding(15)) scrollable(container(Row::from_vec(items)).style(|t| {
.direction(Direction::Horizontal(Scrollbar::new())) let style = container::Style::default();
.height(Length::Fill) style.border(Border::default().width(2))
.width(Length::Fill) }))
.id(self.scroll_id.clone()); .direction(Direction::Horizontal(Scrollbar::new()))
.height(Length::Fill)
.width(Length::Fill)
.id(self.scroll_id.clone());
row.into() row.into()
} }
fn slide_delegate(&self, slide: &Slide) -> Element<'_, Message> { // fn slide_delegate(&self, slide: &Slide) -> Element<'_, Message> {
let font_name = slide.font().into_boxed_str(); // let font_name = slide.font().into_boxed_str();
let family = Family::Name(Box::leak(font_name)); // let family = Family::Name(Box::leak(font_name));
let weight = Weight::Normal; // let weight = Weight::Normal;
let stretch = Stretch::Normal; // let stretch = Stretch::Normal;
let style = Style::Normal; // let style = Style::Normal;
let font = Font { // let font = Font {
family, // family,
weight, // weight,
stretch, // stretch,
style, // style,
}; // };
let slide_id = // let is_current_slide = self.service[self.current_item]
self.slides.iter().position(|s| s == slide).unwrap() // .slides
as i32; // .get(self.current_slide_index as usize)
// .is_some();
// let this_item_index = self
// .service
// .iter()
// .position(|item| item == self.service[self.current_item])
// .unwrap();
// let this_slide_index = self.service[this_item_index].slides;
let container = // let container =
slide_view(slide.clone(), &self.video, font, true, false); // slide_view(slide.clone(), &self.video, font, true, false);
let delegate = mouse_area( // let delegate = mouse_area(
Container::new(container) // Container::new(container)
.style(move |t| { // .style(move |t| {
let mut style = container::Style::default(); // let mut style = container::Style::default();
let theme = t.cosmic(); // let theme = t.cosmic();
let hovered = self.hovered_slide == slide_id; // let hovered = self.hovered_slide == slide_id;
style.background = Some(Background::Color( // style.background = Some(Background::Color(
if self.current_slide_index as i32 == slide_id // if is_current_slide {
{ // theme.accent.base.into()
theme.accent.base.into() // } else if hovered {
} else if hovered { // theme.accent.hover.into()
theme.accent.hover.into() // } else {
} else { // theme.palette.neutral_3.into()
theme.palette.neutral_3.into() // },
}, // ));
)); // style.border = Border::default().rounded(10.0);
style.border = Border::default().rounded(10.0); // style.shadow = Shadow {
style.shadow = Shadow { // color: Color::BLACK,
color: Color::BLACK, // offset: {
offset: { // if is_current_slide {
if self.current_slide_index as i32 // Vector::new(5.0, 5.0)
== slide_id // } else if hovered {
{ // Vector::new(5.0, 5.0)
Vector::new(5.0, 5.0) // } else {
} else if hovered { // Vector::new(0.0, 0.0)
Vector::new(5.0, 5.0) // }
} else { // },
Vector::new(0.0, 0.0) // blur_radius: {
} // if is_current_slide {
}, // 10.0
blur_radius: { // } else if hovered {
if self.current_slide_index as i32 // 10.0
== slide_id // } else {
{ // 0.0
10.0 // }
} else if hovered { // },
10.0 // };
} else { // style
0.0 // })
} // .center_x(100.0 * 16.0 / 9.0)
}, // .height(100)
}; // .padding(10),
style // )
}) // .interaction(cosmic::iced::mouse::Interaction::Pointer)
.center_x(100.0 * 16.0 / 9.0) // .on_move(move |_| Message::HoveredSlide(slide_id))
.height(100) // .on_exit(Message::HoveredSlide(-1))
.padding(10), // .on_press(Message::SlideChange(slide.clone()));
) // delegate.into()
.interaction(cosmic::iced::mouse::Interaction::Pointer) // }
.on_move(move |_| Message::HoveredSlide(slide_id))
.on_exit(Message::HoveredSlide(-1))
.on_press(Message::SlideChange(slide.clone()));
delegate.into()
}
fn reset_video(&mut self) { fn reset_video(&mut self) {
match self.current_slide.background().kind { match self.current_slide.background().kind {