Use explicit fullscreen controls instead of presenter Escape

This commit is contained in:
Dandaedre 2026-11-20 07:19:02 +01:00
parent a0be4211b8
commit 6e350b53e9
9 changed files with 86 additions and 23 deletions

2
Cargo.lock generated
View File

@ -2221,7 +2221,7 @@ dependencies = [
[[package]]
name = "pdf-presenter"
version = "0.1.46"
version = "0.1.47"
dependencies = [
"bytemuck",
"chrono",

View File

@ -4,7 +4,7 @@ default-members = ["crates/pdf-presenter"]
resolver = "3"
[workspace.package]
version = "0.1.46"
version = "0.1.47"
edition = "2024"
license = "MIT"
repository = "https://proxy.dandaedre.com/gitea/idle-org/pdf-presenter"

View File

@ -158,7 +158,8 @@ pub fn tr<'a>(ctx: &egui::Context, text: &'a str) -> &'a str {
"Open PDF…" => "Ouvrir un PDF…",
"Open picture folder…" => "Ouvrir un dossier d’images…",
"Reset timer" => "Réinitialiser le chronomètre",
"Leave fullscreen / safe blank" => "Quitter le plein écran et masquer la sortie",
"Exit fullscreen" => "Quitter le plein écran",
"Enter fullscreen" => "Passer en plein écran",
"RAM budget per process (presenter + output each use this allowance):" => {
"Budget RAM par processus (présentateur et sortie disposent chacun de ce budget) :"
}

View File

@ -446,6 +446,7 @@ impl App {
if self.windowed {
s.settings.presenter_fullscreen = false;
s.settings.presentation_fullscreen = false;
self.windowed = false;
}
if let Some(index) = self.override_presenter.take()
&& let Some((m, _)) = self.handles.get(index)
@ -629,8 +630,6 @@ impl App {
s.layout_open = false;
s.displays_open = false;
s.menu_open = false;
} else {
s.execute(Action::Windowed);
}
}
Key::Named(NamedKey::Space) if role == Role::Presenter && modifiers.shift => {
@ -1107,7 +1106,7 @@ impl ApplicationHandler for App {
}
5 => {
s.layout = Default::default();
s.execute(Action::Windowed);
// Escape dismisses transient UI; fullscreen is an explicit control.
}
6 => {
if self.windows.iter().all(|w| w.frames > 0) && !self.windows.is_empty() {
@ -1284,6 +1283,27 @@ mod buffer_tests {
assert_eq!(app.studio.as_ref().unwrap().requested, expected);
assert!(app.studio.as_ref().unwrap().blanked);
}
let s = app.studio.as_mut().unwrap();
s.settings.presenter_fullscreen = true;
s.settings.presentation_fullscreen = true;
s.blanked = false;
s.jump = "12".into();
app.key(
Role::Presenter,
Key::Named(NamedKey::Escape),
false,
egui::Modifiers::NONE,
);
assert!(app.studio.as_ref().unwrap().jump.is_empty());
app.key(
Role::Presenter,
Key::Named(NamedKey::Escape),
false,
egui::Modifiers::NONE,
);
let s = app.studio.as_ref().unwrap();
assert!(s.presenter_fullscreen() && s.presentation_fullscreen());
assert!(!s.blanked);
}
fn frame(page: usize) -> Arc<Frame> {
Arc::new(Frame {

View File

@ -116,6 +116,23 @@ pub fn theme(ctx: &Context) {
.insert(egui::TextStyle::Body, FontId::proportional(15.));
});
}
fn fullscreen_button(ui: &mut Ui, s: &mut Studio) {
let label = if s.presenter_fullscreen() && s.presentation_fullscreen() {
"Exit fullscreen"
} else {
"Enter fullscreen"
};
if ui
.add_enabled(
s.route_trial.is_none(),
egui::Button::new(tr(ui.ctx(), label)),
)
.clicked()
{
s.actions.push(Action::ToggleFullscreen);
}
}
fn button(ui: &mut Ui, label: &str, action: Action, actions: &mut Vec<Action>) {
if ui.button(label).clicked() {
actions.push(action);
@ -494,6 +511,7 @@ pub fn presenter(ui: &mut Ui, s: &mut Studio, native: &mut UiState) {
s.layout.header = !s.layout.header;
native.header_until = now;
}
fullscreen_button(ui, s);
let trigger = ui.button(tr(&locale, "Menu"));
let mut menu_open = if trigger.clicked() {
!s.menu_open
@ -1433,12 +1451,7 @@ fn menu(ui: &mut Ui, s: &mut Studio) {
s.started = Instant::now();
ui.close();
}
button(
ui,
tr(&locale, "Leave fullscreen / safe blank"),
Action::Windowed,
&mut s.actions,
);
fullscreen_button(ui, s);
button(ui, tr(&locale, "Quit"), Action::Exit, &mut s.actions);
if s.actions.len() != actions_before {
ui.close();

View File

@ -34,7 +34,7 @@ pub enum Action {
CloseBrowser,
Refresh,
Exit,
Windowed,
ToggleFullscreen,
}
pub struct RouteTrial {
pub id: u64,
@ -429,13 +429,15 @@ impl Studio {
}
Action::Refresh => self.dirty_routes = true,
Action::Exit => self.close_requested = true,
Action::Windowed => {
self.execute(Action::RevertRoutes);
self.settings.presenter_fullscreen = false;
self.settings.presentation_fullscreen = false;
self.blanked = true;
self.new_output = true;
self.dirty_routes = true;
Action::ToggleFullscreen => {
if self.route_trial.is_some() {
return;
}
let fullscreen = !(self.presenter_fullscreen() && self.presentation_fullscreen());
self.draft_routes = self.routes.clone();
self.draft_presenter_fullscreen = fullscreen;
self.draft_presentation_fullscreen = fullscreen;
self.execute(Action::ApplyRoutes);
}
}
}

View File

@ -137,7 +137,9 @@ fn shared_actions_preserve_blanking_and_save_scope() {
assert!(!s.change_on_click);
s.execute(Action::CloseBrowser);
assert!(!s.browser_open);
s.execute(Action::Windowed);
s.execute(Action::ToggleFullscreen);
assert!(!s.presenter_fullscreen());
s.execute(Action::KeepRoutes);
assert!(s.blanked);
assert!(!s.settings.presenter_fullscreen);
s.draft_routes.presenter.clear();
@ -838,3 +840,20 @@ fn floating_windows_can_grow_and_shrink_after_content_is_drawn() {
}
}
}
#[test]
fn fullscreen_button_trials_both_directions_and_can_revert() {
let mut s = studio();
s.execute(Action::ToggleFullscreen);
assert!(!s.presenter_fullscreen() && !s.presentation_fullscreen());
assert!(s.settings.presenter_fullscreen);
s.execute(Action::RevertRoutes);
assert!(s.presenter_fullscreen());
s.execute(Action::ToggleFullscreen);
s.execute(Action::KeepRoutes);
assert!(!s.settings.presenter_fullscreen);
s.execute(Action::ToggleFullscreen);
assert!(s.presenter_fullscreen() && s.presentation_fullscreen());
s.execute(Action::KeepRoutes);
assert!(s.settings.presenter_fullscreen && s.settings.presentation_fullscreen);
}

View File

@ -2,6 +2,12 @@
## Unreleased
### 0.1.47
- Escape in the presenter dismisses transient UI without leaving fullscreen or
blanking output. Add explicit Enter/Exit fullscreen controls in the header and
menu, using the existing reversible display trial. Apply `--windowed` only at startup.
### 0.1.46
- Choose unsaved RAM budgets from 15% of available memory, with a soft 512 MiB

View File

@ -73,8 +73,10 @@ preserves blanking. Until an uncached requested slide is ready, output holds the
usable frame. The footer distinguishes requested and acknowledged displayed slides. A red
**NO OUTPUT DISPLAYED** warning marks blanking, no assigned output or no document;
it remains visible when the footer is hidden. Preparing output has a separate status.
Escape cancels a pending slide number/menu, closes the browser, or safely leaves
fullscreen and blanks output. While the presenter is connected, closing a presentation window blanks it; close a
Escape cancels a pending slide number/menu or closes the browser; it does not
leave presenter fullscreen or blank the presentation. Use **Enter fullscreen /
Exit fullscreen** in the header or Menu to toggle both display roles. Like other
display changes, this previews the change with Keep/Revert confirmation. While the presenter is connected, closing a presentation window blanks it; close a
presenter or choose Menu → Quit to end the application.
Arrow keys and Page Up/Down navigate from the presenter. Space moves forward;