aleleba/deckcraft
1
0
Fork 0
mirror of https://github.com/storytold/deckcraft.git synced 2026-11-03 00:41:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #707 from lambertoo: Fix keyboard navigation when Presenter View has focus

Browse Source 
# Conflicts:
#	crates/ui-egui/src/show.rs
This commit is contained in:
Brandon Thomas
2026-10-14 12:54:05 -04:00
parent b9b0fdbab0 ba290f171e
commit 1171e92308
3 changed files with 165 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROADMAP.md
+3
View File
@@ -3,6 +3,7 @@
**Stage: alpha** · next: beta, ~20 points and ~120–210 h away
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-13 · **Change:** trivial (video-seek race fixed and regression-tested; previous: minor, hours to ~95% per audience added; ready 56% → 55%; stage stays alpha; previous: major, full re-measure against PowerPoint for Mac 16.113.4; restructured to the craftrules progress-docs standard) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-14 · **Change:** minor (presenter keyboard navigation; hours to ~95% per audience added; ready 56% → 55%; stage stays alpha; previous: major, full re-measure against PowerPoint for Mac 16.113.4; restructured to the craftrules progress-docs standard) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
DeckCraft aims at full PowerPoint parity, and to be better: faster, open (a documented zip+JSON
format plus PPTX), scriptable by agents (CLI, JSON control channel, MCP), and available everywhere
@@ -132,6 +133,7 @@ app's JSON control channel (`deckcraft --control PORT`).
| 2026-10-13 | Slide show: Honeycomb's hexagons cover the whole slide again — the bottom quarter stayed black until the endpoint (#420) |
| 2026-10-13 | Copy and Cut from the ribbon, the slide's right-click menu and the menus put the text on the system clipboard, as Ctrl+C and Ctrl+X do (#431) |
| 2026-10-13 | Video seeks and loops keep newly decoded frames and end-of-stream notifications; stale generations are filtered when consumed (upstream #416). Deterministic queue coverage and repeated seeks across H.264, HEVC, VP9 and AV1 |
| 2026-10-14 | Presenter View handles the same keyboard navigation as the audience window, consumes handled keys before focused buttons, and remains available at the end screen. Regression tests cover presenter-only input, single-step navigation and Escape |
| 2026-10-13 | Slide transitions like PowerPoint: every transition and option measured frame by frame against PowerPoint's video export and retuned (curves, directions, soft edges, 3-D perspective, contents moving over backgrounds); PowerPoint's own XML elements and defaults read and written (diagonal Wipe, Zoom, Shape In/Out, Glitter Hexagons, Shred In/Out, Page Curl Single); `deckcraft-cli render-transition` renders frames headless |
| 2026-10-13 | Wild text cases measured against PowerPoint (102 synthetic slides): bidi by run language, East Asian vertical text upright, mongolianVert/wordArtVert/wordArtVertRtl, underline styles and strikethrough at the font's metrics, centre/right/decimal tabs, East Asian, Thai, Hindi, Arabic and Hebrew numbering, small caps, all-caps "ß", transparent text, soft hyphens, kinsoku, rtlCol and just/dist anchoring, emoji presentation, fallback faces that no longer move the baseline |
| 2026-10-13 | Render matches PowerPoint more closely on wild shape, picture and table cases: even-odd custom paths, dashes and caps, arrowheads, radial and path gradients, tile rects, rotWithShape, gradient lines, shadows cast by what is drawn (group and perspective too), group fill, picture borders, tiles, reflection, recolour (biLevel, alphaInv, brightness/contrast), table borders and grid default, 20+ preset shapes by their ECMA formulas, default miter joins, and approximate 3-D bevels, cameras and face lighting |
@@ -157,6 +159,7 @@ app's JSON control channel (`deckcraft --control PORT`).
|---|---|---|
| 2026-10-13 | trivial | Progress log: Eyedropper in the colour menus, slide.colorAt (#367) |
| 2026-10-13 | trivial | Progress log: video seek frame-loss race and regression coverage |
| 2026-10-14 | minor | Presenter keyboard navigation and end-screen controls |
| 2026-10-13 | trivial | Progress log: wild text cases |
| 2026-10-13 | trivial | Progress log: slide show for interactive decks |
| 2026-10-12 | trivial | Progress log: File tab (Backstage, #76) |
crates/ui-egui/src/show.rs
+159 -49
View File
@@ -128,6 +128,7 @@ impl Show {
self.step_end = now;
}
ShowAction::Slide(i) => {
self.ended = false;
if self.rehearse {
self.timings.push((self.timeline.as_ref().map(|t| t.0).unwrap_or(i), now - self.slide_start));
}
@@ -248,6 +249,67 @@ fn part_textures(ctx: &egui::Context, doc: &Presentation, from: Option<usize>, t
]
}
/// Read the current viewport's show keys before its widgets can consume them. Both the
/// audience window and Presenter View use this path, including animation steps and end-of-show.
fn keyboard(ctx: &egui::Context, show: &mut Show, doc: &Presentation, now: f64) -> bool {
let keys: Vec<(egui::Key, egui::Modifiers)> = ctx.input(|i| {
i.events
.iter()
.filter_map(|e| if let egui::Event::Key { key, pressed: true, modifiers, .. } = e { Some((*key, *modifiers)) } else { None })
.collect()
});
let mut keep = true;
let mut actions = vec![];
for (k, m) in keys {
use egui::Key::*;
match k {
Escape | Minus => keep = false,
ArrowRight | ArrowDown | Space | PageDown | N => {
if show.ended {
keep = false;
} else {
actions.push(show.state.next(doc));
}
}
Enter => {
if let Ok(n) = show.goto.parse::<usize>() {
actions.push(show.state.goto(doc, n.saturating_sub(1)));
show.goto.clear();
} else if show.ended {
keep = false;
} else {
actions.push(show.state.next(doc));
}
}
ArrowLeft | ArrowUp | Backspace | PageUp | P if !(k == P && m.command) => {
show.ended = false;
actions.push(show.state.prev(doc));
}
P if m.command => show.pen = !show.pen,
A if m.command => show.pen = false,
Home => actions.push(show.state.goto(doc, 0)),
End => actions.push(show.state.goto(doc, doc.slides.len().saturating_sub(1))),
B | Period => show.blank = if show.blank == Some(Color32::BLACK) { None } else { Some(Color32::BLACK) },
W | Comma => show.blank = if show.blank == Some(Color32::WHITE) { None } else { Some(Color32::WHITE) },
E => show.strokes.clear(),
Num0 | Num1 | Num2 | Num3 | Num4 | Num5 | Num6 | Num7 | Num8 | Num9 => {
show.goto.push_str(k.name());
}
_ => continue,
}
// The same key must not also activate a focused presenter button or be handled again
// by an embedded presenter viewport.
ctx.input_mut(|i| i.consume_key(m, k));
ctx.request_repaint_of(egui::ViewportId::ROOT);
}
for action in actions {
if !show.apply(action, doc, now) {
keep = false;
}
}
keep
}
pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
let ctx = ui.ctx().clone();
let Some(doc) = app.session.active().map(|d| d.doc.clone()) else {
@@ -267,58 +329,12 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
}
show.after_enter(&doc, now);
}
let mut keep = true;
// Input.
let (keys, clicked, secondary, moved) = ctx.input(|i| {
let keys: Vec<(egui::Key, egui::Modifiers)> = i
.events
.iter()
.filter_map(|e| if let egui::Event::Key { key, pressed: true, modifiers, .. } = e { Some((*key, *modifiers)) } else { None })
.collect();
(keys, i.pointer.primary_clicked(), i.pointer.secondary_clicked(), i.pointer.delta().length() > 0.0)
});
let mut keep = keyboard(&ctx, &mut show, &doc, now);
let (clicked, secondary, moved) = ctx.input(|i| (i.pointer.primary_clicked(), i.pointer.secondary_clicked(), i.pointer.delta().length() > 0.0));
if moved {
show.last_move = now;
}
let mut actions: Vec<ShowAction> = vec![];
for (k, m) in keys {
use egui::Key::*;
match k {
Escape | Minus => keep = false,
ArrowRight | ArrowDown | Space | PageDown | N => {
if show.ended {
keep = false;
} else {
actions.push(show.state.next(&doc));
}
}
Enter => {
if let Ok(n) = show.goto.parse::<usize>() {
actions.push(show.state.goto(&doc, n.saturating_sub(1)));
show.goto.clear();
} else if show.ended {
keep = false;
} else {
actions.push(show.state.next(&doc));
}
}
ArrowLeft | ArrowUp | Backspace | PageUp | P if !(k == P && m.command) => {
show.ended = false;
actions.push(show.state.prev(&doc));
}
P if m.command => show.pen = !show.pen,
A if m.command => show.pen = false,
Home => actions.push(show.state.goto(&doc, 0)),
End => actions.push(show.state.goto(&doc, doc.slides.len().saturating_sub(1))),
B | Period => show.blank = if show.blank == Some(Color32::BLACK) { None } else { Some(Color32::BLACK) },
W | Comma => show.blank = if show.blank == Some(Color32::WHITE) { None } else { Some(Color32::WHITE) },
E => show.strokes.clear(),
Num0 | Num1 | Num2 | Num3 | Num4 | Num5 | Num6 | Num7 | Num8 | Num9 => {
show.goto.push_str(k.name());
}
_ => {}
}
}
// The clock of the triggered animations runs before anything reacts to the pointer.
show.tick_triggers(&doc, now);
let on_slide = !show.pen && !show.ended && show.blank.is_none() && !show.reading_bar_hit(&ctx);
@@ -680,7 +696,7 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
ctx.request_repaint_after(std::time::Duration::from_millis(100));
}
// Presenter view in a second window.
if show.presenter && !show.reading && !show.ended {
if keep && show.presenter && !show.reading {
presenter_window(&ctx, &mut show, &doc, now, &mut keep);
}
if keep {
@@ -899,6 +915,9 @@ fn presenter_window(ctx: &egui::Context, show: &mut Show, doc: &Presentation, no
egui::ViewportId::from_hash_of("deckcraft_presenter"),
egui::ViewportBuilder::default().with_title("Presenter View — DeckCraft").with_inner_size([1100.0, 700.0]),
|ui, _| {
if !keyboard(ui.ctx(), show, doc, now) {
*keep = false;
}
egui::CentralPanel::default().frame(egui::Frame::NONE.fill(Color32::from_gray(24)).inner_margin(egui::Margin::same(16))).show(ui, |ui| {
ui.horizontal(|ui| {
ui.label(
@@ -972,6 +991,97 @@ mod tests {
use super::*;
/// Send real egui key events to the presenter UI, without the audience window's handler.
#[test]
fn presenter_navigation_uses_its_own_keyboard_events() {
use egui_kittest::kittest::Queryable;
let mut session = deckcraft_engine::Session::with_new();
session.execute("slide.new", &json!({})).unwrap();
session.execute("slide.new", &json!({})).unwrap();
let doc = session.active().unwrap().doc.clone();
let show = Show::new(&doc, 0, false, true);
let mut harness = egui_kittest::Harness::builder().with_size(vec2(1100.0, 700.0)).build_ui_state(
|ui, (doc, show, keep): &mut (std::sync::Arc<Presentation>, Show, bool)| {
let now = ui.input(|i| i.time);
presenter_window(ui.ctx(), show, doc, now, keep);
},
(doc, show, true),
);
harness.run_steps(2);
for (key, slide) in [
(egui::Key::ArrowRight, 1),
(egui::Key::ArrowLeft, 0),
(egui::Key::Space, 1),
(egui::Key::PageDown, 2),
(egui::Key::PageUp, 1),
(egui::Key::Home, 0),
(egui::Key::End, 2),
] {
harness.key_press(key);
harness.run_steps(2);
assert_eq!(harness.state().1.state.slide, slide, "presenter key {key:?}");
}
harness.key_press(egui::Key::ArrowRight);
harness.run_steps(2);
assert!(harness.state().1.ended);
harness.key_press(egui::Key::ArrowLeft);
harness.run_steps(2);
assert!(!harness.state().1.ended);
assert_eq!(harness.state().1.state.slide, 2, "back from the end screen restores the last slide");
harness.key_press(egui::Key::ArrowRight);
harness.run_steps(2);
assert!(harness.state().1.ended);
harness.get_by_label("◀ Previous").click();
harness.run_steps(2);
assert!(!harness.state().1.ended, "the presenter Previous button also leaves the end screen");
harness.key_press(egui::Key::Home);
harness.run_steps(2);
harness.get_by_label("Next ▶").click();
harness.run_steps(2);
assert_eq!(harness.state().1.state.slide, 1);
harness.key_press(egui::Key::Space);
harness.run_steps(2);
assert_eq!(harness.state().1.state.slide, 2);
assert!(!harness.state().1.ended, "Space must not also activate the focused Next button");
harness.key_press(egui::Key::Escape);
harness.run_steps(2);
assert!(!harness.state().2, "Escape from Presenter View ends the show");
}
#[test]
fn slideshow_navigation_advances_once_with_presenter_view() {
use egui_kittest::kittest::Queryable;
let mut session = deckcraft_engine::Session::with_new();
session.execute("slide.new", &json!({})).unwrap();
session.execute("slide.new", &json!({})).unwrap();
let mut app = SlideApp::new(session, crate::Services::default());
app.ui.presenter_view = true;
let mut harness = egui_kittest::Harness::builder().with_size(vec2(1000.0, 700.0)).build_ui_state(
|ui, app: &mut SlideApp| {
app.logic(ui.ctx());
app.ui(ui);
},
app,
);
harness.run_steps(3);
harness.state_mut().start_show(0, false);
harness.run_steps(2);
harness.key_press(egui::Key::ArrowRight);
harness.run_steps(2);
assert_eq!(harness.state().show.as_ref().unwrap().state.slide, 1, "one key advances one slide");
harness.key_press(egui::Key::End);
harness.run_steps(2);
harness.key_press(egui::Key::ArrowRight);
harness.run_steps(2);
assert!(harness.state().show.as_ref().unwrap().ended);
assert!(harness.query_by_label("End Show").is_some(), "the presenter remains available at the end screen");
harness.key_press(egui::Key::Escape);
harness.run_steps(2);
assert!(harness.state().show.is_none());
}
#[test]
fn a_transition_keeps_the_old_slide_in_its_own_texture() {
// #33: the old slide's handle was cloned, so the new slide was rendered into the same
docs/slideshow-parity.md
+3
View File
@@ -2,6 +2,7 @@
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-13 · **Change:** minor (interactive-deck clicks in the slide show; previous: major (created; measured from `crates/ui-egui/src/show.rs` and `crates/anim/src/show.rs` against PowerPoint 16.113's Slide Show tab and menu)) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-13 · **Change:** minor (video seek frame-loss race fixed, upstream #416; previous: major, created; measured from `crates/ui-egui/src/show.rs` and `crates/anim/src/show.rs` against PowerPoint 16.113's Slide Show tab and menu) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-14 · **Change:** minor (keyboard navigation from Presenter View) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
Presenting is the job PowerPoint is hired for. This doc covers the show window, presenter view,
rehearsal and recording. Transition and animation playback are in
@@ -44,6 +45,7 @@ ready** (estimated), **10–16 h** to parity.
| Elapsed timer | yes | yes | |
| Pause / reset timer, clock | yes | no | |
| Slide counter, previous/next/end buttons | yes | yes | |
| Keyboard navigation while Presenter View has focus | yes | yes | Shares the audience window's key handling; handled keys are consumed before buttons, and the presenter stays available at the end screen |
| Notes font size, scrolling | yes | scrolling only | |
| Placed on the presenter's display automatically, show on the projector | yes | **no**: opens wherever the OS puts it | Beta blocker, 3–5 h |
| Swap displays | yes | no | |
@@ -80,4 +82,5 @@ Reading View in a window with navigation: present (checklist row done).
|---|---|---|
| 2026-10-13 | minor | Click handling for interactive decks: triggers, per-slide state kept across visits, visible-shape hit testing with hand cursor, advance on click |
| 2026-10-13 | minor | Video seek handoff no longer discards freshly decoded frames or end-of-stream (upstream #416); deterministic queue and four-codec seek regression tests |
| 2026-10-14 | minor | Presenter View handles slideshow keys in its own viewport, including returning from the end screen and Escape; regression tests cover navigation and avoiding duplicate button activation |
| 2026-10-10 | major | Created: show, presenter view, rehearse and record, compared with PowerPoint 16.113's Slide Show tab and menu |