Keep timer and display controls in the presenter header
Gitea/pdf-presenter/pipeline/head There was a failure building this commit Details

This commit is contained in:
Dandaedre 2026-11-20 08:40:08 +01:00
parent 0948f3b890
commit f5b3a6cce8
6 changed files with 125 additions and 115 deletions

2
Cargo.lock generated
View File

@ -2245,7 +2245,7 @@ dependencies = [
[[package]]
name = "pdf-presenter"
version = "0.1.60"
version = "0.1.61"
dependencies = [
"bytemuck",
"chrono",

View File

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

View File

@ -366,33 +366,30 @@ fn widget(
);
});
}
fn timer_controls(ui: &mut Ui, s: &mut Studio, close: bool) {
fn timer_buttons(ui: &mut Ui, s: &mut Studio) {
let locale = ui.ctx().clone();
let running = s.timer.running(Instant::now(), s.timer_limit());
ui.horizontal_wrapped(|ui| {
if ui
.button(tr(
&locale,
if running {
"Pause timer"
} else {
"Start timer"
},
))
.clicked()
{
s.execute(Action::ToggleTimer);
if close {
ui.close();
}
}
if ui.button(tr(&locale, "Restart timer")).clicked() {
s.execute(Action::RestartTimer);
if close {
ui.close();
}
}
});
if ui
.button(tr(
&locale,
if running {
"Pause timer"
} else {
"Start timer"
},
))
.clicked()
{
s.execute(Action::ToggleTimer);
}
if ui.button(tr(&locale, "Restart timer")).clicked() {
s.execute(Action::RestartTimer);
}
}
fn timer_controls(ui: &mut Ui, s: &mut Studio) {
let locale = ui.ctx().clone();
ui.horizontal_wrapped(|ui| timer_buttons(ui, s));
let running = s.timer.running(Instant::now(), s.timer_limit());
let state = if running {
"Running"
} else if s.timer.waiting_for_slide && s.layout.timer_autostart {
@ -458,7 +455,7 @@ fn timer_settings(ui: &mut Ui, s: &mut Studio) {
{
s.timer = crate::timer::Timer::default();
}
timer_controls(ui, s, false);
timer_controls(ui, s);
}
fn timer_position(ui: &mut Ui, id: &str, position: &mut TimerPosition) {
@ -669,8 +666,8 @@ pub fn presenter(ui: &mut Ui, s: &mut Studio, native: &mut UiState) {
});
let header_timer_height = timer_height(s, TimerPosition::Header);
let separate_header_timers =
header_timer_height > 100. || (header_timer_height > 0. && screen.width() < 1100.);
let header_controls_height = 44.;
header_timer_height > 100. || (header_timer_height > 0. && screen.width() < 1400.);
let header_controls_height = if screen.width() < 1100. { 76. } else { 44. };
let header_height = (header_timer_height
+ 20.
+ if separate_header_timers {
@ -678,7 +675,7 @@ pub fn presenter(ui: &mut Ui, s: &mut Studio, native: &mut UiState) {
} else {
0.
})
.max(64.)
.max(header_controls_height + 20.)
.min(screen.height() * 0.35);
let mut body = screen.shrink(16.);
if s.layout.header {
@ -963,76 +960,85 @@ pub fn presenter(ui: &mut Ui, s: &mut Studio, native: &mut UiState) {
controls.max.y = controls.min.y + header_controls_height - 8.;
}
ui.scope_builder(egui::UiBuilder::new().max_rect(controls), |ui| {
ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| {
if bar_visibility_button(ui, s.layout.header, true).clicked() {
s.layout.header = !s.layout.header;
native.header_until = now;
}
let trigger = ui.button(tr(&locale, "Menu"));
let mut menu_open = if trigger.clicked() {
!s.menu_open
} else {
s.menu_open
};
// Settings controls and nested selectors must not dismiss their parent menu.
egui::Popup::menu(&trigger)
.close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
.open_bool(&mut menu_open)
.show(|ui| {
egui::ScrollArea::vertical()
.max_height(
(screen.bottom() - trigger.rect.bottom() - 16.).clamp(80., 720.),
)
.show(ui, |ui| menu(ui, s));
});
s.menu_open = menu_open;
ui.label(
s.deck
.as_ref()
.map_or("PDF Presenter", |d| d.title.as_str()),
);
if ui.button(tr(&locale, "Displays")).clicked() {
s.begin_display_edit();
}
button(
ui,
tr(&locale, "All slides"),
Action::OpenBrowser,
&mut s.actions,
);
if ui.button(tr(&locale, "Layout")).clicked() {
s.layout_open = !s.layout_open;
}
fullscreen_button(ui, s);
let inactive = s.blanked || s.routes.presentation.is_empty() || s.count() == 0;
let color = if inactive {
ui.visuals().error_fg_color
} else {
ui.visuals().hyperlink_color
};
let (indicator, _) = ui.allocate_exact_size(Vec2::splat(12.), Sense::hover());
ui.painter().circle_filled(indicator.center(), 5., color);
if ui
.button(
egui::RichText::new(if s.blanked {
tr(&locale, "Show presentation")
} else {
tr(&locale, "Blank presentation")
})
.color(if s.blanked {
ui.visuals().error_fg_color
} else {
ui.visuals().hyperlink_color
}),
)
.clicked()
{
s.actions.push(Action::Blank);
}
if !separate_header_timers {
timers(ui, s, TimerPosition::Header);
}
});
ui.with_layout(
egui::Layout::left_to_right(egui::Align::Center).with_main_wrap(true),
|ui| {
if bar_visibility_button(ui, s.layout.header, true).clicked() {
s.layout.header = !s.layout.header;
native.header_until = now;
}
let trigger = ui.button(tr(&locale, "Menu"));
let mut menu_open = if trigger.clicked() {
!s.menu_open
} else {
s.menu_open
};
// Settings controls and nested selectors must not dismiss their parent menu.
egui::Popup::menu(&trigger)
.close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
.open_bool(&mut menu_open)
.show(|ui| {
egui::ScrollArea::vertical()
.max_height(
(screen.bottom() - trigger.rect.bottom() - 16.)
.clamp(80., 720.),
)
.show(ui, |ui| menu(ui, s));
});
s.menu_open = menu_open;
ui.add_sized(
[100., 20.],
egui::Label::new(
s.deck
.as_ref()
.map_or("PDF Presenter", |d| d.title.as_str()),
)
.truncate(),
);
if ui.button(tr(&locale, "Displays")).clicked() {
s.begin_display_edit();
}
button(
ui,
tr(&locale, "All slides"),
Action::OpenBrowser,
&mut s.actions,
);
if ui.button(tr(&locale, "Layout")).clicked() {
s.layout_open = !s.layout_open;
}
fullscreen_button(ui, s);
timer_buttons(ui, s);
let inactive = s.blanked || s.routes.presentation.is_empty() || s.count() == 0;
let color = if inactive {
ui.visuals().error_fg_color
} else {
ui.visuals().hyperlink_color
};
let (indicator, _) = ui.allocate_exact_size(Vec2::splat(12.), Sense::hover());
ui.painter().circle_filled(indicator.center(), 5., color);
if ui
.button(
egui::RichText::new(if s.blanked {
tr(&locale, "Show presentation")
} else {
tr(&locale, "Blank presentation")
})
.color(if s.blanked {
ui.visuals().error_fg_color
} else {
ui.visuals().hyperlink_color
}),
)
.clicked()
{
s.actions.push(Action::Blank);
}
if !separate_header_timers {
timers(ui, s, TimerPosition::Header);
}
},
);
});
if separate_header_timers {
let timer_rect = Rect::from_min_max(
@ -2020,14 +2026,6 @@ fn menu(ui: &mut Ui, s: &mut Studio) {
Action::OpenBrowser,
&mut s.actions,
);
if ui.button(tr(&locale, "Displays")).clicked() {
s.begin_display_edit();
ui.close();
}
if ui.button(tr(&locale, "Layout")).clicked() {
s.layout_open = true;
ui.close();
}
ui.menu_button(tr(&locale, "Appearance"), |ui| {
ui.with_layout(egui::Layout::top_down(egui::Align::Min), |ui| {
ui.set_min_width(250.);
@ -2126,8 +2124,6 @@ fn menu(ui: &mut Ui, s: &mut Studio) {
});
}
ui.separator();
timer_controls(ui, s, true);
fullscreen_button(ui, s);
button(ui, tr(&locale, "Quit"), Action::Exit, &mut s.actions);
if s.actions.len() != actions_before {
ui.close();

View File

@ -530,7 +530,14 @@ fn nested_settings_remain_interactive_and_menu_still_dismisses() {
assert!(s.menu_open);
click(&mut s, "Restart timer");
assert!(s.timer.running(std::time::Instant::now(), s.timer_limit()));
assert!(!s.menu_open, "Commands should dismiss the dropdown");
assert!(
!s.menu_open,
"Clicking the header command should dismiss the dropdown"
);
click(&mut s, "Pause timer");
assert!(!s.timer.running(std::time::Instant::now(), s.timer_limit()));
click(&mut s, "Start timer");
assert!(s.timer.running(std::time::Instant::now(), s.timer_limit()));
click(&mut s, "Menu");
click(&mut s, "Demo");
assert!(!s.menu_open, "Outside click should dismiss the dropdown");

View File

@ -2,6 +2,13 @@
## Unreleased
### 0.1.61
- Keep Displays, Layout and fullscreen as header buttons and remove their Menu
duplicates. Add direct Start/Pause and Restart timer header buttons; remove
timer controls from Menu while retaining them in Layout's timer settings.
Wrap controls on narrow windows and reserve a separate row for header clocks.
### 0.1.60
- Match the zoom-enabled current preview to the first connected presentation

View File

@ -75,7 +75,7 @@ usable frame. The footer distinguishes requested and acknowledged displayed slid
it remains visible when the footer is hidden. Preparing output has a separate status.
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
Exit fullscreen** in the header 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.
@ -91,7 +91,7 @@ time and the local HH:MM clock. Hidden widgets release their space. Notes wrap a
automatically shrink to fit; extremely long notes can become too small to read.
The previous-slide preview is off by default; enable **Previous slide** in Layout
when you want it. Saved layouts keep their chosen visibility.
Menu → Reset timer starts elapsed time again. Bundled UI fonts cover their supplied
The header’s **Restart timer** button starts elapsed time again. Bundled UI fonts cover their supplied
character sets; broad CJK text coverage remains a packaging acceptance item.
Save layout (this project) stores an override for the canonical document/folder path.
@ -224,7 +224,7 @@ Header, Above slides, Below notes, or left/right of the notes or slides.
Timer text can be set up to 320 logical pixels; it scales down only to fit its
allocated space. Timers on the same side stack vertically. Timers have separate labeled boxes; size and
visibility controls still apply. Body positions remain visible when bars are hidden.
Use **Start timer**, **Pause timer** and **Restart timer** in Menu or Layout.
Use **Start timer**, **Pause timer** and **Restart timer** in the presenter header or Layout.
Pause preserves the time; Restart resets and starts immediately. Under Layout →
Timers and progress, choose **Elapsed time** or **Countdown** and set a countdown
in minutes and seconds (up to 24 hours). **Start on first slide** is enabled by