diff --git a/Cargo.lock b/Cargo.lock index 1b6d568..7a915b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2212,7 +2212,7 @@ dependencies = [ [[package]] name = "pdf-presenter" -version = "0.1.41" +version = "0.1.42" dependencies = [ "bytemuck", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 486507f..3d6eabf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["crates/pdf-presenter"] resolver = "3" [workspace.package] -version = "0.1.41" +version = "0.1.42" edition = "2024" license = "MIT" repository = "https://proxy.dandaedre.com/gitea/idle-org/pdf-presenter" diff --git a/crates/pdf-presenter/src/presenter_ui.rs b/crates/pdf-presenter/src/presenter_ui.rs index a867312..b2d9789 100644 --- a/crates/pdf-presenter/src/presenter_ui.rs +++ b/crates/pdf-presenter/src/presenter_ui.rs @@ -967,6 +967,10 @@ fn browser_screen_settings(ui: &mut Ui, s: &mut Studio) { } pub fn browser(ui: &mut Ui, s: &mut Studio, native: &mut UiState) { let browser_width = ui.available_width(); + let footer_rect = Rect::from_min_max( + Pos2::new(ui.max_rect().left(), ui.max_rect().bottom() - 44.), + ui.max_rect().max, + ); let locale = ui.ctx().clone(); ui.painter() .rect_filled(ui.max_rect(), 0., ui.visuals().panel_fill); @@ -990,16 +994,6 @@ pub fn browser(ui: &mut Ui, s: &mut Studio, native: &mut UiState) { ui.spacing_mut().item_spacing = Vec2::new(16., 10.); ui.spacing_mut().button_padding = Vec2::new(12., 7.); ui.spacing_mut().interact_size.y = 30.; - ui.horizontal_wrapped(|ui| { - ui.heading(tr(&locale, "All slides")); - button( - ui, - tr(&locale, "Close"), - Action::CloseBrowser, - &mut s.actions, - ); - }); - ui.add_space(2.); if ui.available_width() >= 680. { ui.columns(2, |columns| { browser_preview_settings(&mut columns[0], s); @@ -1105,6 +1099,7 @@ pub fn browser(ui: &mut Ui, s: &mut Studio, native: &mut UiState) { s.visible_thumbs.clear(); egui::ScrollArea::vertical() .max_width(browser_width) + .max_height((footer_rect.top() - ui.cursor().top() - 8.).max(0.)) .auto_shrink([false, false]) .scroll_bar_visibility(egui::scroll_area::ScrollBarVisibility::AlwaysVisible) .show_rows(ui, size * 0.5625 + 50., rows, |ui, range| { @@ -1161,6 +1156,17 @@ pub fn browser(ui: &mut Ui, s: &mut Studio, native: &mut UiState) { }); } }); + ui.scope_builder(egui::UiBuilder::new().max_rect(footer_rect), |ui| { + ui.separator(); + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + if ui + .add(egui::Button::new(tr(&locale, "Close")).min_size(Vec2::new(100., 32.))) + .clicked() + { + s.actions.push(Action::CloseBrowser); + } + }); + }); if let Some((_, page)) = s.browser_preview { // Keep preview requests in the browser's bounded asynchronous loading path. s.visible_thumbs.insert(page); diff --git a/docs/changelog.md b/docs/changelog.md index ba404d8..a62162d 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,6 +2,11 @@ ## Unreleased +### 0.1.42 + +- Remove the redundant All slides heading from the browser content and move Close + into a fixed bottom-right footer, outside the scrolling thumbnail grid. + ### 0.1.41 - Redesign All slides controls with labeled settings cards, a filled Compact/Large