From d8d8250efe97b8dd10d97df43d46b8957d86c5e1 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Fri, 20 Nov 2026 07:01:48 +0100 Subject: [PATCH] Draw reliable bar visibility icons and clarify auto-hide tooltips --- Cargo.lock | 2 +- Cargo.toml | 2 +- crates/pdf-presenter/src/localization.rs | 4 +- crates/pdf-presenter/src/presenter_ui.rs | 60 ++++++++++++++---------- docs/changelog.md | 6 +++ 5 files changed, 46 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1998aa6..0fc7662 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2212,7 +2212,7 @@ dependencies = [ [[package]] name = "pdf-presenter" -version = "0.1.39" +version = "0.1.40" dependencies = [ "bytemuck", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 2968926..204e22a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["crates/pdf-presenter"] resolver = "3" [workspace.package] -version = "0.1.39" +version = "0.1.40" edition = "2024" license = "MIT" repository = "https://proxy.dandaedre.com/gitea/idle-org/pdf-presenter" diff --git a/crates/pdf-presenter/src/localization.rs b/crates/pdf-presenter/src/localization.rs index 3a79899..5e34953 100644 --- a/crates/pdf-presenter/src/localization.rs +++ b/crates/pdf-presenter/src/localization.rs @@ -68,8 +68,8 @@ pub fn tr<'a>(ctx: &egui::Context, text: &'a str) -> &'a str { "Clock position" => "Position de l’horloge", "Slide progress bar" => "Barre de progression des diapositives", "Slide" => "Diapositive", - "Hide" => "Masquer", - "Pin" => "Épingler", + "Auto-hide header" => "Masquer automatiquement l’en-tête", + "Auto-hide footer" => "Masquer automatiquement le pied de page", "Menu" => "Menu", "Displays" => "Écrans", "All slides" => "Toutes les diapositives", diff --git a/crates/pdf-presenter/src/presenter_ui.rs b/crates/pdf-presenter/src/presenter_ui.rs index c1f25b2..0362e3d 100644 --- a/crates/pdf-presenter/src/presenter_ui.rs +++ b/crates/pdf-presenter/src/presenter_ui.rs @@ -121,6 +121,40 @@ fn button(ui: &mut Ui, label: &str, action: Action, actions: &mut Vec) { actions.push(action); } } +// Paint the bar/chevron directly: visibility controls must not depend on font glyphs. +fn bar_visibility_button(ui: &mut Ui, pinned: bool, header: bool) -> egui::Response { + let label = tr( + ui.ctx(), + match (header, pinned) { + (true, true) => "Auto-hide header", + (false, true) => "Auto-hide footer", + (true, false) => "Keep header visible", + (false, false) => "Keep footer visible", + }, + ) + .to_owned(); + let response = ui.add(egui::Button::new("").min_size(Vec2::splat(28.))); + response.widget_info(|| { + egui::WidgetInfo::labeled(egui::WidgetType::Button, ui.is_enabled(), &label) + }); + let center = response.rect.center(); + let stroke = egui::Stroke::new(2_f32, ui.style().interact(&response).fg_stroke.color); + let edge = if header { -7. } else { 7. }; + ui.painter().line_segment( + [center + Vec2::new(-7., edge), center + Vec2::new(7., edge)], + stroke, + ); + let direction = if header == pinned { -1. } else { 1. }; + ui.painter().add(egui::Shape::line( + vec![ + center + Vec2::new(-5., -2. * direction), + center + Vec2::new(0., 3. * direction), + center + Vec2::new(5., -2. * direction), + ], + stroke, + )); + response.on_hover_text(label) +} fn widget(ui: &mut Ui, label: &str, w: &mut crate::settings::Widget, min: f32, max: f32) { let locale = ui.ctx().clone(); ui.checkbox(&mut w.show, label); @@ -437,18 +471,7 @@ pub fn presenter(ui: &mut Ui, s: &mut Studio, native: &mut UiState) { ui.painter().rect_filled(rect, 0., ui.visuals().window_fill); ui.scope_builder(egui::UiBuilder::new().max_rect(rect.shrink(10.)), |ui| { ui.horizontal(|ui| { - if ui - .add( - egui::Button::new(if s.layout.header { "↑" } else { "↓" }) - .min_size(Vec2::splat(24.)), - ) - .on_hover_text(if s.layout.header { - tr(&locale, "Hide") - } else { - tr(&locale, "Pin") - }) - .clicked() - { + if bar_visibility_button(ui, s.layout.header, true).clicked() { s.layout.header = !s.layout.header; native.header_until = now; } @@ -522,18 +545,7 @@ pub fn presenter(ui: &mut Ui, s: &mut Studio, native: &mut UiState) { ui.painter().rect_filled(rect, 0., ui.visuals().window_fill); ui.scope_builder(egui::UiBuilder::new().max_rect(rect.shrink(8.)), |ui| { ui.horizontal(|ui| { - if ui - .add( - egui::Button::new(if s.layout.footer { "↓" } else { "↑" }) - .min_size(Vec2::splat(24.)), - ) - .on_hover_text(if s.layout.footer { - tr(&locale, "Hide") - } else { - tr(&locale, "Pin") - }) - .clicked() - { + if bar_visibility_button(ui, s.layout.footer, false).clicked() { s.layout.footer = !s.layout.footer; native.footer_until = now; } diff --git a/docs/changelog.md b/docs/changelog.md index e657952..d7d4326 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,6 +2,12 @@ ## Unreleased +### 0.1.40 + +- Draw header/footer visibility icons directly instead of relying on arrow glyphs. + Use explicit Auto-hide header/footer tooltips and accessible names, switching to + Keep header/footer visible when the bar is already auto-hidden. + ### 0.1.39 - Rename the All slides screen selector to “Show on screen” (French: “Afficher