This commit is contained in:
parent
fade333634
commit
abcb283a0d
2 changed files with 8 additions and 8 deletions
|
@ -383,7 +383,7 @@ impl Presenter {
|
||||||
|
|
||||||
pub fn view(&self) -> Element<Message> {
|
pub fn view(&self) -> Element<Message> {
|
||||||
slide_view(
|
slide_view(
|
||||||
self.current_slide.clone(),
|
&self.current_slide,
|
||||||
&self.video,
|
&self.video,
|
||||||
self.current_font,
|
self.current_font,
|
||||||
false,
|
false,
|
||||||
|
@ -393,7 +393,7 @@ impl Presenter {
|
||||||
|
|
||||||
pub fn view_preview(&self) -> Element<Message> {
|
pub fn view_preview(&self) -> Element<Message> {
|
||||||
slide_view(
|
slide_view(
|
||||||
self.current_slide.clone(),
|
&self.current_slide,
|
||||||
&self.video,
|
&self.video,
|
||||||
self.current_font,
|
self.current_font,
|
||||||
false,
|
false,
|
||||||
|
@ -436,7 +436,7 @@ impl Presenter {
|
||||||
as i32;
|
as i32;
|
||||||
|
|
||||||
let container =
|
let container =
|
||||||
slide_view(slide.clone(), &self.video, font, true, false);
|
slide_view(&slide, &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| {
|
||||||
|
@ -542,13 +542,13 @@ fn scale_font(font_size: f32, width: f32) -> f32 {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn slide_view(
|
pub(crate) fn slide_view<'a>(
|
||||||
slide: Slide,
|
slide: &'a Slide,
|
||||||
video: &Option<Video>,
|
video: &'a Option<Video>,
|
||||||
font: Font,
|
font: Font,
|
||||||
delegate: bool,
|
delegate: bool,
|
||||||
hide_mouse: bool,
|
hide_mouse: bool,
|
||||||
) -> Element<'_, Message> {
|
) -> Element<'a, Message> {
|
||||||
let res = responsive(move |size| {
|
let res = responsive(move |size| {
|
||||||
let width = size.height * 16.0 / 9.0;
|
let width = size.height * 16.0 / 9.0;
|
||||||
let slide_text = slide.text();
|
let slide_text = slide.text();
|
||||||
|
|
|
@ -294,7 +294,7 @@ impl SongEditor {
|
||||||
.map(|(index, slide)| {
|
.map(|(index, slide)| {
|
||||||
container(
|
container(
|
||||||
slide_view(
|
slide_view(
|
||||||
slide,
|
&slide,
|
||||||
if index == 0 {
|
if index == 0 {
|
||||||
&self.video
|
&self.video
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue