diff --git a/src/main.rs b/src/main.rs index 91ae9ee..c1e4db2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -288,22 +288,6 @@ impl cosmic::Application for App { } fn header_start(&self) -> Vec> { - vec![] - } - fn header_center(&self) -> Vec> { - vec![search_input("Search...", "") - .on_input(|_| Message::None) - .on_submit(|_| Message::None) - .width(Length::Fill) - .into()] - } - fn header_end(&self) -> Vec> { - // let editor_toggle = toggler(self.editor_mode.is_some()) - // .label("Editor") - // .spacing(10) - // .width(Length::Shrink) - // .on_toggle(Message::EditorToggle); - let presenter_window = self.windows.get(1); let text = if self.presentation_open { text::body("End Presentation") @@ -370,6 +354,30 @@ impl cosmic::Application for App { ) .into(), horizontal_space().width(HEADER_SPACE).into(), + ] + } + fn header_center(&self) -> Vec> { + vec![search_input("Search...", "") + .on_input(|_| Message::None) + .on_submit(|_| Message::None) + .width(300) + .into()] + } + fn header_end(&self) -> Vec> { + // let editor_toggle = toggler(self.editor_mode.is_some()) + // .label("Editor") + // .spacing(10) + // .width(Length::Shrink) + // .on_toggle(Message::EditorToggle); + + let presenter_window = self.windows.get(1); + let text = if self.presentation_open { + text::body("End Presentation") + } else { + text::body("Present") + }; + + vec![ tooltip( button::custom( row!( diff --git a/src/ui/presenter.rs b/src/ui/presenter.rs index d3bd197..f5720d1 100644 --- a/src/ui/presenter.rs +++ b/src/ui/presenter.rs @@ -551,7 +551,7 @@ pub(crate) fn slide_view( .text(&slide_text) .fill("#fff") .shadow(text_svg::shadow(2, 2, 5, "#000000")) - .stroke(text_svg::stroke(1, "#000")) + .stroke(text_svg::stroke(3, "#000")) .font(font) .view() .map(|m| Message::None); diff --git a/src/ui/text_svg.rs b/src/ui/text_svg.rs index 69141e8..2cbc8c7 100644 --- a/src/ui/text_svg.rs +++ b/src/ui/text_svg.rs @@ -218,7 +218,7 @@ impl TextSvg { }; let stroke = if let Some(stroke) = &self.stroke { format!( - "stroke=\"{}\" stroke-width=\"{}\"", + "stroke=\"{}\" stroke-width=\"{}px\" paint-order=\"stroke\"", stroke.color, stroke.size ) } else { diff --git a/test_presentation.lisp b/test_presentation.lisp index ae1b5a3..da2c32a 100644 --- a/test_presentation.lisp +++ b/test_presentation.lisp @@ -4,7 +4,7 @@ (slide (video :source "~/vids/The Basics of Hanging Drywall.mkv" :fit contain)) (slide (video :source "~/vids/Ladybird Is The Future Of Web Browsers.webm" :fit contain)) (song :id 7 :author "North Point Worship" - :font "Quicksand Bold" :font-size 30 + :font "Quicksand Bold" :font-size 60 :shadow "" :stroke "" :title "Death Was Arrested" :background (image :source "file:///home/chris/nc/tfc/openlp/CMG - Bright Mountains 01.jpg" :fit cover)