diff --git a/Cargo.lock b/Cargo.lock index 7d99314..cb2927c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -670,7 +670,7 @@ dependencies = [ [[package]] name = "deckstride" -version = "0.1.97" +version = "0.1.98" dependencies = [ "bytemuck", "chrono", diff --git a/Cargo.toml b/Cargo.toml index acdcdd6..bf0604c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["crates/deckstride"] resolver = "3" [workspace.package] -version = "0.1.97" +version = "0.1.98" edition = "2024" license = "MIT" repository = "https://proxy.dandaedre.com/gitea/idle-org/deckstride" diff --git a/crates/deckstride/src/presenter_ui.rs b/crates/deckstride/src/presenter_ui.rs index 62c69d1..0db93fe 100644 --- a/crates/deckstride/src/presenter_ui.rs +++ b/crates/deckstride/src/presenter_ui.rs @@ -1267,8 +1267,7 @@ fn presenter_view( .show(|ui| { egui::ScrollArea::vertical() .max_height( - (screen.bottom() - trigger.rect.bottom() - 16.) - .clamp(80., 720.), + (screen.bottom() - trigger.rect.bottom() - 16.).max(80.), ) .show(ui, |ui| menu(ui, s, &mut view.preferences_open)); }); @@ -2406,6 +2405,69 @@ pub fn browser(ui: &mut Ui, s: &mut Studio, native: &mut UiState) { quit_confirmation(ui.ctx(), s); } +fn appearance_preferences(ui: &mut Ui, s: &mut Studio) { + let locale = ui.ctx().clone(); + layout_section(ui, tr(&locale, "Appearance"), |ui| { + let mut changed = false; + egui::Grid::new("preferences-appearance-grid") + .num_columns(2) + .spacing(Vec2::new(12., 8.)) + .show(ui, |ui| { + ui.label(tr(&locale, "Theme")); + egui::ComboBox::from_id_salt("preferences-theme") + .selected_text(s.settings.theme.name()) + .show_ui(ui, |ui| { + for theme in crate::theme::Theme::ALL { + changed |= ui + .selectable_value(&mut s.settings.theme, theme, theme.name()) + .changed(); + } + }); + ui.end_row(); + ui.label(tr(&locale, "Language")); + egui::ComboBox::from_id_salt("preferences-language") + .selected_text(s.settings.language.name()) + .show_ui(ui, |ui| { + for language in crate::localization::Language::ALL { + changed |= ui + .selectable_value( + &mut s.settings.language, + language, + language.name(), + ) + .changed(); + } + }); + ui.end_row(); + }); + ui.separator(); + for (label, color) in [ + ( + "Page background", + &mut s.settings.slide_colors.page_background, + ), + ( + "Fit padding color", + &mut s.settings.slide_colors.fit_padding, + ), + ] { + ui.horizontal(|ui| { + ui.label(tr(&locale, label)); + changed |= ui.color_edit_button_srgb(color).changed(); + }); + } + ui.small(tr( + &locale, + "Page background fills transparency; fit padding fills space around the slide.", + )); + if changed { + s.new_output = true; + s.save_preferences(); + ui.ctx().request_repaint(); + } + }); +} + fn preferences_window(ctx: &egui::Context, s: &mut Studio, open: &mut bool) { let locale = ctx.clone(); let mut window_open = true; @@ -2416,7 +2478,7 @@ fn preferences_window(ctx: &egui::Context, s: &mut Studio, open: &mut bool) { .open(&mut window_open) .collapsible(false) .resizable(true) - .default_size(Vec2::new(620., 640.).min(screen - Vec2::splat(32.))) + .default_size(Vec2::new(620., 760.).min(screen - Vec2::splat(32.))) .min_size(Vec2::new(360., 320.)) .max_size((screen - Vec2::splat(24.)).max(Vec2::splat(1.))) .show(ctx, |ui| { @@ -2427,6 +2489,8 @@ fn preferences_window(ctx: &egui::Context, s: &mut Studio, open: &mut bool) { .auto_shrink([false, false]) .max_height(scroll_height) .show(ui, |ui| { + appearance_preferences(ui, s); + ui.add_space(8.); layout_section( ui, tr(&locale, "Blank Slides image"), @@ -2626,12 +2690,6 @@ fn menu(ui: &mut Ui, s: &mut Studio, preferences_open: &mut bool) { }, ); ui.separator(); - button( - ui, - tr(&locale, "All slides"), - Action::OpenBrowser, - &mut s.actions, - ); ui.menu_button(tr(&locale, "Autoplay"), |ui| { ui.set_min_width(250.); let mut changed = ui @@ -2661,67 +2719,6 @@ fn menu(ui: &mut Ui, s: &mut Studio, preferences_open: &mut bool) { ui.ctx().request_repaint(); } }); - ui.menu_button(tr(&locale, "Appearance"), |ui| { - ui.with_layout(egui::Layout::top_down(egui::Align::Min), |ui| { - ui.set_min_width(250.); - let mut changed = false; - ui.label( - egui::RichText::new(tr(&locale, "Theme")) - .small() - .strong() - .color(ui.visuals().weak_text_color()), - ); - ui.menu_button(s.settings.theme.name(), |ui| { - for theme in crate::theme::Theme::ALL { - let name = theme.name(); - changed |= ui - .selectable_value(&mut s.settings.theme, theme, name) - .changed(); - } - }); - ui.add_space(6.); - ui.separator(); - ui.add_space(4.); - ui.label( - egui::RichText::new(tr(&locale, "Language")) - .small() - .strong() - .color(ui.visuals().weak_text_color()), - ); - ui.menu_button(s.settings.language.name(), |ui| { - for language in crate::localization::Language::ALL { - changed |= ui - .selectable_value(&mut s.settings.language, language, language.name()) - .changed(); - } - }); - ui.separator(); - for (label, color) in [ - ( - "Page background", - &mut s.settings.slide_colors.page_background, - ), - ( - "Fit padding color", - &mut s.settings.slide_colors.fit_padding, - ), - ] { - ui.horizontal(|ui| { - ui.label(tr(&locale, label)); - changed |= ui.color_edit_button_srgb(color).changed(); - }); - } - ui.small(tr( - &locale, - "Page background fills transparency; fit padding fills space around the slide.", - )); - if changed { - s.new_output = true; - s.save_preferences(); - ui.ctx().request_repaint(); - } - }); - }); ui.separator(); ui.label( egui::RichText::new(tr(&locale, "Quick settings")) diff --git a/crates/deckstride/tests/presenter_ui.rs b/crates/deckstride/tests/presenter_ui.rs index 557fc6c..5c0bceb 100644 --- a/crates/deckstride/tests/presenter_ui.rs +++ b/crates/deckstride/tests/presenter_ui.rs @@ -505,6 +505,16 @@ fn quick_settings_and_preferences_window_remain_interactive() { } }; click(&mut s, "Menu"); + click(&mut s, "Quit"); + assert!( + s.actions + .iter() + .any(|action| matches!(action, Action::Exit)), + "Quit should be directly reachable without scrolling at 1080p" + ); + assert!(!s.menu_open); + s.actions.clear(); + click(&mut s, "Menu"); click(&mut s, "Autoplay"); click(&mut s, "Play automatically"); assert!(s.settings.autoplay_enabled); @@ -514,22 +524,16 @@ fn quick_settings_and_preferences_window_remain_interactive() { assert!(s.menu_open); click(&mut s, "Menu"); click(&mut s, "Menu"); - click(&mut s, "Appearance"); + click(&mut s, "Preferences…"); + assert!(s.preferences_open); + assert!(!s.menu_open); click(&mut s, "Midra Dark"); - assert!( - s.menu_open, - "Opening a theme selector must keep its parents open" - ); click(&mut s, "High Contrast"); assert_eq!(s.settings.theme, deckstride::theme::Theme::HighContrast); - assert!(s.menu_open); - click(&mut s, "English"); - click(&mut s, "System language"); - assert_eq!( - s.settings.language, - deckstride::localization::Language::System - ); - assert!(s.menu_open); + assert!(s.preferences_open); + click(&mut s, "Close"); + assert!(!s.preferences_open); + click(&mut s, "Menu"); let zoom_enabled = s.settings.zoom_enabled; click(&mut s, "Enable page zoom"); assert_eq!(s.settings.zoom_enabled, !zoom_enabled); diff --git a/docs/changelog.md b/docs/changelog.md index 8988319..9642cb5 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,6 +2,14 @@ ## Unreleased +### 0.1.98 + +- Shorten the Presenter menu by removing its duplicate All slides command and moving + theme, language and slide colors into the Preferences window. Keep zoom, fitted + zoom behavior, automatic Slides output and Autoplay available directly. +- Keep the menu vertically scrollable on small screens while leaving Quit visible + without scrolling at ordinary Presenter window sizes. + ### 0.1.97 - Publish future release assets to both Gitea and GitHub from one reviewed build,