mirror of
https://github.com/storytold/deckcraft.git
synced 2026-10-25 19:17:06 -06:00
Merge PR #649 from NikitkaRa: Show: See All Slides and zoom
# Conflicts: # crates/ui-egui/src/show.rs
This commit is contained in:
Brandon Thomas
@@ -180,6 +180,7 @@ app's JSON control channel (`deckcraft --control PORT`).
|
||||
| 2026-10-13 | Playback stays with its document and its clip (#415): switching decks or closing the last one stops the previous sound, replacing a clip plays the new one, and the duration and decode caches keep the bytes they are keyed by |
|
||||
| 2026-10-13 | Slide show: a laser pointer (Cmd/Ctrl+L, the show's laser colour, no ink). Checklist row Partial; weighted breadth stays 79%, P2 summary 39%, slide show area 68%. The presenter window does not move the dot |
|
||||
| 2026-10-14 | Slide Show: Show Media Controls writes the show setting and hides the playback bar and GIF button during the show |
|
||||
| 2026-10-14 | See All Slides and zoom during a show: a thumbnail grid (G, or All), click to jump, and click-to-zoom at 2× (Z). Presenter view has Black, White, All slides and Zoom. Breadth stays 79% |
|
||||
| 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 |
|
||||
@@ -228,6 +229,7 @@ app's JSON control channel (`deckcraft --control PORT`).
|
||||
| 2026-10-13 | trivial | Progress log: media playback follows the open document and clip (#415) |
|
||||
| 2026-10-13 | trivial | Progress log: laser pointer. Headline P2 36% → 39% to match the checklist (the row moves P2 unweighted 38% → 39%; breadth stays 79%) |
|
||||
| 2026-10-14 | trivial | Progress log: Show Media Controls |
|
||||
| 2026-10-14 | trivial | Progress log: See All Slides and zoom during a show. Breadth stays 79% |
|
||||
| 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) |
|
||||
|
||||
@@ -75,7 +75,13 @@ pub fn inspect(app: &SlideApp, ctx: &egui::Context) -> Value {
|
||||
"dialog": app.dialog.as_ref().map(|d| d.id.clone()),
|
||||
"home": app.backstage_open(),
|
||||
"backstage": app.backstage.as_ref().map(|b| b.page.id()),
|
||||
"showing": app.show.as_ref().map(|s| json!({"slide": s.state.slide, "step": s.state.step, "ended": s.ended})),
|
||||
"showing": app.show.as_ref().map(|s| {
|
||||
let (n, aspect) = app.session.active().map(|d| {
|
||||
let h = d.doc.slide_size.height.max(1.0) as f32;
|
||||
(d.doc.slides.len(), d.doc.slide_size.width as f32 / h)
|
||||
}).unwrap_or((0, 16.0 / 9.0));
|
||||
s.showing_value(n, aspect, ctx.content_rect())
|
||||
}),
|
||||
"documents": app.session.documents().iter().map(|d| json!({"title": d.title(), "dirty": d.is_dirty(), "path": d.path})).collect::<Vec<_>>(),
|
||||
"status": app.status.as_ref().map(|s| s.0.clone()),
|
||||
"perf": {"frameMs": app.perf.frame_ms, "renderMs": app.perf.render_ms, "fps": app.perf.fps},
|
||||
|
||||
+526
-53
@@ -1,5 +1,6 @@
|
||||
//! Slide Show: full-screen playback with transitions and animations (`deckcraft-anim`),
|
||||
//! keyboard/mouse navigation, pen, black/white screens, presenter view and rehearsed timings.
|
||||
//! keyboard/mouse navigation, pen, black/white screens, See All Slides, zoom, presenter view
|
||||
//! and rehearsed timings.
|
||||
|
||||
use deckcraft_anim::{Click, HitShape, Layer, LinkJump, ShowAction, ShowState, Source, StepStamp, Timeline, TriggerPlay};
|
||||
use deckcraft_model::text::Hyperlink;
|
||||
@@ -31,6 +32,12 @@ pub struct Show {
|
||||
/// advancing only uploads it (#240).
|
||||
prefetch: Option<Prefetch>,
|
||||
blank: Option<Color32>,
|
||||
/// See All Slides covers the show until a slide is chosen.
|
||||
pub grid: bool,
|
||||
/// The next click on the slide zooms in there.
|
||||
pub zoom_arm: bool,
|
||||
zoom: Option<Zoom>,
|
||||
thumbs: Vec<(usize, TextureHandle)>,
|
||||
pen: bool,
|
||||
/// A dot that follows the pointer and leaves no ink (`Cmd/Ctrl+L`).
|
||||
laser: bool,
|
||||
@@ -171,6 +178,10 @@ impl Show {
|
||||
next_tex: None,
|
||||
prefetch: None,
|
||||
blank: None,
|
||||
grid: false,
|
||||
zoom_arm: false,
|
||||
zoom: None,
|
||||
thumbs: vec![],
|
||||
pen: false,
|
||||
laser: false,
|
||||
strokes: vec![],
|
||||
@@ -240,6 +251,8 @@ impl Show {
|
||||
}
|
||||
ShowAction::Slide(i) => {
|
||||
self.ended = false;
|
||||
self.zoom = None;
|
||||
self.zoom_arm = false;
|
||||
if self.rehearse {
|
||||
self.timings.push((self.timeline.as_ref().map(|t| t.0).unwrap_or(i), now - self.slide_start));
|
||||
}
|
||||
@@ -398,41 +411,56 @@ fn keyboard(ctx: &egui::Context, show: &mut Show, doc: &Presentation, now: f64)
|
||||
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));
|
||||
if show.grid && !matches!(k, Escape | Minus) {
|
||||
// See All Slides takes no other keys until a slide is chosen.
|
||||
if k == G && plain(m) {
|
||||
show.grid = false;
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
match k {
|
||||
Escape | Minus => {
|
||||
if !show.back_out() {
|
||||
keep = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
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));
|
||||
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.set_pen(!show.pen),
|
||||
L if m.command => show.set_laser(!show.laser),
|
||||
A if m.command => show.arrow(),
|
||||
Home => actions.push(show.state.goto(doc, 0)),
|
||||
End => actions.push(show.state.goto(doc, doc.slides.len().saturating_sub(1))),
|
||||
B | Period => toggle_blank(show, Color32::BLACK),
|
||||
W | Comma => toggle_blank(show, Color32::WHITE),
|
||||
E => show.strokes.clear(),
|
||||
G if plain(m) => show.grid = true,
|
||||
Z if plain(m) => show.zoom_key(),
|
||||
Num0 | Num1 | Num2 | Num3 | Num4 | Num5 | Num6 | Num7 | Num8 | Num9 => {
|
||||
show.goto.push_str(k.name());
|
||||
}
|
||||
_ => continue,
|
||||
}
|
||||
ArrowLeft | ArrowUp | Backspace | PageUp | P if !(k == P && m.command) => {
|
||||
show.ended = false;
|
||||
actions.push(show.state.prev(doc));
|
||||
}
|
||||
P if m.command => show.set_pen(!show.pen),
|
||||
L if m.command => show.set_laser(!show.laser),
|
||||
A if m.command => show.arrow(),
|
||||
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.
|
||||
@@ -472,9 +500,21 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
|
||||
show.last_move = now;
|
||||
}
|
||||
let mut actions: Vec<ShowAction> = vec![];
|
||||
let full = ui.max_rect();
|
||||
let avail = if show.reading { Rect::from_min_max(full.min, pos2(full.max.x, full.max.y - 34.0)) } else { full };
|
||||
let srect = fit(avail, &doc);
|
||||
let pointer = ctx.input(|i| i.pointer.interact_pos());
|
||||
// The clock of the triggered animations runs before anything reacts to the pointer.
|
||||
show.tick_triggers(&doc, now);
|
||||
let on_slide = !show.pen && !show.laser && !show.ended && show.blank.is_none() && !show.reading_bar_hit(&ctx) && !pointer_on_media_bar(&ctx, ui, &doc, &show);
|
||||
let on_slide = !show.grid
|
||||
&& !show.pen
|
||||
&& !show.laser
|
||||
&& !show.ended
|
||||
&& show.blank.is_none()
|
||||
&& show.zoom.is_none()
|
||||
&& !show.zoom_arm
|
||||
&& !show.reading_bar_hit(&ctx)
|
||||
&& !pointer_on_media_bar(&ctx, ui, &doc, &show);
|
||||
let gif_click = if clicked && on_slide && doc.show.show_media_controls { gif_hit(&ctx, ui, &show, doc_uid, &doc, app) } else { None };
|
||||
let media_click = if clicked && on_slide && gif_click.is_none() { media_hit(&ctx, ui, &show, &doc) } else { None };
|
||||
let under = if on_slide && gif_click.is_none() && media_click.is_none() { shapes_under_pointer(&ctx, ui, &mut show, &doc, now) } else { None };
|
||||
@@ -491,6 +531,27 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
|
||||
LinkJump::Exit => keep = false,
|
||||
LinkJump::None => {}
|
||||
}
|
||||
} else if show.grid && clicked {
|
||||
let aspect = slide_aspect(&doc);
|
||||
if let Some(p) = pointer
|
||||
&& let Some(n) = see_all_hit(full, grid_indices(doc.slides.len()).len(), aspect, p)
|
||||
&& let Some(&i) = grid_indices(doc.slides.len()).get(n)
|
||||
{
|
||||
show.grid = false;
|
||||
show.blank = None;
|
||||
show.zoom = None;
|
||||
show.zoom_arm = false;
|
||||
actions.push(show.state.goto(&doc, i));
|
||||
}
|
||||
} else if clicked && show.zoom_arm && !show.reading_bar_hit(&ctx) {
|
||||
if let Some(p) = pointer
|
||||
&& let Some((nx, ny)) = norm_on_slide(srect, unit_uv(), p)
|
||||
{
|
||||
show.zoom = Some(Zoom::at(nx, ny));
|
||||
show.zoom_arm = false;
|
||||
}
|
||||
} else if clicked && show.zoom.is_some() && !show.pen && !show.reading_bar_hit(&ctx) {
|
||||
show.dismiss_zoom();
|
||||
} else if clicked && !show.pen && !show.reading_bar_hit(&ctx) && !pointer_on_media_bar(&ctx, ui, &doc, &show) {
|
||||
if show.ended {
|
||||
keep = false;
|
||||
@@ -507,7 +568,7 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
|
||||
}
|
||||
}
|
||||
}
|
||||
if secondary && !show.ended {
|
||||
if secondary && !show.ended && !show.grid && show.zoom.is_none() && !show.zoom_arm {
|
||||
actions.push(show.state.prev(&doc));
|
||||
}
|
||||
// Apply input first: a step started by this click must restart the clock before it is read.
|
||||
@@ -532,7 +593,8 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
|
||||
let next_auto = show.timeline(&doc).step_is_auto(cur_step);
|
||||
let n_steps = show.timeline(&doc).steps();
|
||||
let step_due = cur_step < n_steps && ((show.autoplay && idle > 0.3) || next_auto);
|
||||
if step_due || (!show.rehearse && show.state.auto_advance_due(&doc, idle) && !show.ended) {
|
||||
let holding = show.grid || show.zoom.is_some() || show.zoom_arm;
|
||||
if !holding && (step_due || (!show.rehearse && show.state.auto_advance_due(&doc, idle) && !show.ended)) {
|
||||
actions.push(show.state.next(&doc));
|
||||
} else if show.preview_only && cur_step >= n_steps && idle > 0.8 {
|
||||
keep = false;
|
||||
@@ -550,11 +612,8 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
|
||||
show_media(app, &mut show, doc_uid, &doc);
|
||||
run_media_cues(app, &mut show, doc_uid, &doc);
|
||||
// Draw.
|
||||
let full = ui.max_rect();
|
||||
let painter = ui.painter_at(full);
|
||||
painter.rect_filled(full, CornerRadius::ZERO, Color32::BLACK);
|
||||
let avail = if show.reading { Rect::from_min_max(full.min, pos2(full.max.x, full.max.y - 34.0)) } else { full };
|
||||
let srect = fit(avail, &doc);
|
||||
let ppp = ctx.pixels_per_point();
|
||||
let size = ((srect.width() * ppp).round().max(1.0) as u32, (srect.height() * ppp).round().max(1.0) as u32);
|
||||
if show.ended {
|
||||
@@ -710,10 +769,11 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
|
||||
if !drew {
|
||||
show.trans = None;
|
||||
if let Some(tex) = &tex {
|
||||
painter.image(tex.id(), srect, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
|
||||
painter.image(tex.id(), srect, show.zoom_uv(), Color32::WHITE);
|
||||
}
|
||||
// Playing video: the current frame in its box, or full screen.
|
||||
let k = srect.width() / doc.slide_size.width.max(1.0) as f32;
|
||||
let (sw, sh) = (doc.slide_size.width as f32, doc.slide_size.height as f32);
|
||||
let uv = show.zoom_uv();
|
||||
for (id, x, clip) in &media {
|
||||
if !clip.video || hidden.contains(id) {
|
||||
continue;
|
||||
@@ -721,13 +781,15 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
|
||||
let r = if clip.full_screen && app.media.is_playing(*id) {
|
||||
full
|
||||
} else {
|
||||
Rect::from_min_size(pos2(srect.min.x + x.x as f32 * k, srect.min.y + x.y as f32 * k), vec2(x.w as f32 * k, x.h as f32 * k))
|
||||
slide_box(srect, uv, sw, sh, x.x as f32, x.y as f32, x.w as f32, x.h as f32)
|
||||
};
|
||||
crate::media::paint_frame(&painter, &app.media, *id, r);
|
||||
}
|
||||
// Play/pause on the animated GIF under the pointer, and the audio/video bar.
|
||||
// Slide Show ▸ Show Media Controls hides both (the click still plays a clip).
|
||||
if doc.show.show_media_controls {
|
||||
// Not while zoomed: the controls sit where the whole slide would be.
|
||||
if doc.show.show_media_controls && !show.zoom_arm && show.zoom.is_none() {
|
||||
let k = srect.width() / sw.max(1.0);
|
||||
if let Some(p) = ctx.input(|i| i.pointer.hover_pos()).filter(|_| !show.pen && !show.laser && now - show.last_move < 2.5) {
|
||||
for g in &gifs {
|
||||
let r = on_screen(srect, k, &g.rect);
|
||||
@@ -746,7 +808,9 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
|
||||
match action {
|
||||
Some(crate::media::BarAction::Toggle) => app.media.toggle(doc_uid, &doc, id, &clip, crate::media::Owner::Show),
|
||||
Some(crate::media::BarAction::Seek(t)) => app.media.seek(doc_uid, &doc, id, &clip, t, crate::media::Owner::Show),
|
||||
Some(crate::media::BarAction::Nudge(dt)) => app.media.seek(doc_uid, &doc, id, &clip, (pos + dt).max(0.0), crate::media::Owner::Show),
|
||||
Some(crate::media::BarAction::Nudge(dt)) => {
|
||||
app.media.seek(doc_uid, &doc, id, &clip, (pos + dt).max(0.0), crate::media::Owner::Show)
|
||||
}
|
||||
None => {}
|
||||
}
|
||||
}
|
||||
@@ -765,14 +829,19 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
|
||||
if resp.drag_started() {
|
||||
show.strokes.push(vec![]);
|
||||
}
|
||||
let uv = show.zoom_uv();
|
||||
if resp.dragged()
|
||||
&& let (Some(p), Some(s)) = (resp.interact_pointer_pos(), show.strokes.last_mut())
|
||||
&& let Some(p) = resp.interact_pointer_pos()
|
||||
&& let Some((nx, ny)) = norm_on_slide(srect, uv, p)
|
||||
&& let Some(s) = show.strokes.last_mut()
|
||||
{
|
||||
s.push(pos2((p.x - srect.min.x) / srect.width(), (p.y - srect.min.y) / srect.height()));
|
||||
s.push(pos2(nx, ny));
|
||||
}
|
||||
ctx.set_cursor_icon(egui::CursorIcon::Crosshair);
|
||||
} else if show.laser {
|
||||
ctx.set_cursor_icon(egui::CursorIcon::None);
|
||||
} else if show.zoom_arm || show.grid {
|
||||
ctx.set_cursor_icon(egui::CursorIcon::Crosshair);
|
||||
} else if pointing {
|
||||
ctx.set_cursor_icon(egui::CursorIcon::PointingHand);
|
||||
} else if now - show.last_move > 2.5 && !show.reading {
|
||||
@@ -780,8 +849,9 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
|
||||
ctx.request_repaint_after(std::time::Duration::from_millis(500));
|
||||
}
|
||||
let pen_col = theme::to_color32(doc.show.pen_color);
|
||||
let uv = show.zoom_uv();
|
||||
for s in &show.strokes {
|
||||
let pts: Vec<Pos2> = s.iter().map(|q| pos2(srect.min.x + q.x * srect.width(), srect.min.y + q.y * srect.height())).collect();
|
||||
let pts: Vec<Pos2> = s.iter().map(|q| slide_to_screen(srect, uv, q.x, q.y)).collect();
|
||||
painter.add(egui::Shape::line(pts, Stroke::new(3.0, pen_col)));
|
||||
}
|
||||
if show.laser
|
||||
@@ -792,6 +862,15 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
|
||||
painter.circle_filled(p, 16.0, Color32::from_rgba_unmultiplied(c.r(), c.g(), c.b(), 70));
|
||||
painter.circle_filled(p, 5.5, c);
|
||||
}
|
||||
if show.zoom_arm && !show.grid {
|
||||
painter.text(
|
||||
pos2(full.center().x, full.min.y + 36.0),
|
||||
Align2::CENTER_CENTER,
|
||||
"Click the slide to zoom in. Esc cancels.",
|
||||
theme::font(16.0),
|
||||
Color32::WHITE,
|
||||
);
|
||||
}
|
||||
// Reading view bar / on-screen controls.
|
||||
if show.reading {
|
||||
let bar = Rect::from_min_max(pos2(full.min.x, full.max.y - 34.0), full.max);
|
||||
@@ -821,8 +900,8 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
|
||||
let a = show.state.prev(&doc);
|
||||
show.apply(a, &doc, now);
|
||||
}
|
||||
} else if now - show.last_move < 2.5 {
|
||||
let bar = Rect::from_min_size(pos2(full.min.x + 20.0, full.max.y - 50.0), vec2(250.0, 34.0));
|
||||
} else if !show.grid && (now - show.last_move < 2.5 || show.zoom_arm) {
|
||||
let bar = tool_bar_rect(full);
|
||||
painter.rect_filled(bar, CornerRadius::same(17), Color32::from_black_alpha(140));
|
||||
let mut child =
|
||||
ui.new_child(egui::UiBuilder::new().max_rect(bar.shrink2(vec2(10.0, 4.0))).layout(egui::Layout::left_to_right(egui::Align::Center)));
|
||||
@@ -843,14 +922,26 @@ pub fn ui(app: &mut SlideApp, ui: &mut Ui) {
|
||||
if b(&mut child, if show.laser { "◉ on" } else { "◉" }).clicked() {
|
||||
show.set_laser(!show.laser);
|
||||
}
|
||||
if b(&mut child, "⬛").clicked() {
|
||||
show.blank = Some(Color32::BLACK);
|
||||
if b(&mut child, "Black").clicked() {
|
||||
toggle_blank(&mut show, Color32::BLACK);
|
||||
}
|
||||
if b(&mut child, "White").clicked() {
|
||||
toggle_blank(&mut show, Color32::WHITE);
|
||||
}
|
||||
if b(&mut child, "All").clicked() {
|
||||
show.grid = !show.grid;
|
||||
}
|
||||
if b(&mut child, show.zoom_label()).clicked() {
|
||||
show.zoom_key();
|
||||
}
|
||||
if b(&mut child, "End").clicked() {
|
||||
keep = false;
|
||||
}
|
||||
ctx.request_repaint_after(std::time::Duration::from_millis(300));
|
||||
}
|
||||
if show.grid && !show.ended {
|
||||
paint_grid(&painter, &ctx, &mut show, &doc, full);
|
||||
}
|
||||
if show.rehearse {
|
||||
let t = now - show.slide_start;
|
||||
let total = now - show.show_start;
|
||||
@@ -1139,15 +1230,308 @@ fn gif_hit(ctx: &egui::Context, ui: &Ui, show: &Show, doc_uid: u64, doc: &Presen
|
||||
}
|
||||
|
||||
impl Show {
|
||||
fn zoom_uv(&self) -> Rect {
|
||||
self.zoom.map(Zoom::uv).unwrap_or_else(unit_uv)
|
||||
}
|
||||
|
||||
fn zoom_label(&self) -> &'static str {
|
||||
if self.zoom.is_some() {
|
||||
"Zoom on"
|
||||
} else if self.zoom_arm {
|
||||
"Zoom…"
|
||||
} else {
|
||||
"Zoom"
|
||||
}
|
||||
}
|
||||
|
||||
/// Z, or the Zoom button: arm a click-to-zoom, or leave a zoom that is already on.
|
||||
fn zoom_key(&mut self) {
|
||||
if self.zoom.is_some() || self.zoom_arm {
|
||||
self.dismiss_zoom();
|
||||
} else {
|
||||
self.zoom_arm = true;
|
||||
self.pen = false;
|
||||
}
|
||||
}
|
||||
|
||||
/// Esc closes See All Slides, then a zoom, and only then leaves the show.
|
||||
fn back_out(&mut self) -> bool {
|
||||
if self.grid {
|
||||
self.grid = false;
|
||||
true
|
||||
} else {
|
||||
self.dismiss_zoom()
|
||||
}
|
||||
}
|
||||
|
||||
/// Esc backs out of a zoom before it leaves the show. True when it did.
|
||||
fn dismiss_zoom(&mut self) -> bool {
|
||||
if self.zoom.is_some() || self.zoom_arm {
|
||||
self.zoom = None;
|
||||
self.zoom_arm = false;
|
||||
true
|
||||
} else {
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
pub fn blank_name(&self) -> Option<&'static str> {
|
||||
match self.blank {
|
||||
Some(c) if c == Color32::BLACK => Some("black"),
|
||||
Some(c) if c == Color32::WHITE => Some("white"),
|
||||
Some(_) => Some("blank"),
|
||||
None => None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn zoom_view(&self) -> Option<(f32, f32, f32)> {
|
||||
self.zoom.map(|z| (z.nx, z.ny, z.scale))
|
||||
}
|
||||
|
||||
pub fn showing_value(&self, n_slides: usize, aspect: f32, full: Rect) -> serde_json::Value {
|
||||
let mut v = json!({
|
||||
"slide": self.state.slide,
|
||||
"step": self.state.step,
|
||||
"ended": self.ended,
|
||||
"grid": self.grid,
|
||||
"zoomArm": self.zoom_arm,
|
||||
"blank": self.blank_name(),
|
||||
"zoom": self.zoom_view().map(|(x, y, scale)| json!({"x": x, "y": y, "scale": scale})),
|
||||
});
|
||||
if self.grid {
|
||||
let slides = grid_indices(n_slides);
|
||||
let cells = see_all_cells(full, slides.len(), aspect);
|
||||
v["cells"] =
|
||||
serde_json::Value::Array(slides.iter().zip(cells).map(|(i, r)| json!({"slide": i, "x": r.center().x, "y": r.center().y})).collect());
|
||||
}
|
||||
v
|
||||
}
|
||||
|
||||
fn reading_bar_hit(&self, ctx: &egui::Context) -> bool {
|
||||
// Clicks on the on-screen controls must not also advance.
|
||||
ctx.input(|i| i.pointer.interact_pos()).is_some_and(|p| {
|
||||
let r = ctx.content_rect();
|
||||
(self.reading && p.y > r.max.y - 34.0) || (!self.reading && p.y > r.max.y - 56.0 && p.x < r.min.x + 280.0)
|
||||
(self.reading && p.y > r.max.y - 34.0) || (!self.reading && tool_bar_rect(r).expand(8.0).contains(p))
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const ZOOM_SCALE: f32 = 2.0;
|
||||
const GRID_CAP: usize = 48;
|
||||
const TOOL_BAR_W: f32 = 520.0;
|
||||
|
||||
#[derive(Clone, Copy)]
|
||||
struct Zoom {
|
||||
nx: f32,
|
||||
ny: f32,
|
||||
scale: f32,
|
||||
}
|
||||
|
||||
impl Zoom {
|
||||
fn at(nx: f32, ny: f32) -> Self {
|
||||
Zoom { nx: finite_unit(nx), ny: finite_unit(ny), scale: ZOOM_SCALE }
|
||||
}
|
||||
|
||||
fn uv(self) -> Rect {
|
||||
zoom_uv(self.nx, self.ny, self.scale)
|
||||
}
|
||||
}
|
||||
|
||||
fn finite_unit(n: f32) -> f32 {
|
||||
if n.is_finite() { n.clamp(0.0, 1.0) } else { 0.5 }
|
||||
}
|
||||
|
||||
fn plain(m: egui::Modifiers) -> bool {
|
||||
!m.command && !m.ctrl && !m.alt && !m.shift
|
||||
}
|
||||
|
||||
fn unit_uv() -> Rect {
|
||||
Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0))
|
||||
}
|
||||
|
||||
fn slide_aspect(doc: &Presentation) -> f32 {
|
||||
let a = doc.slide_size.width as f32 / doc.slide_size.height.max(1.0) as f32;
|
||||
if a.is_finite() && a > 0.05 { a } else { 16.0 / 9.0 }
|
||||
}
|
||||
|
||||
/// The part of the slide a zoom shows, in 0–1 texture space. The window stays on the slide.
|
||||
fn zoom_uv(nx: f32, ny: f32, scale: f32) -> Rect {
|
||||
let scale = if scale.is_finite() && scale > 1.0 { scale } else { ZOOM_SCALE };
|
||||
let w = 1.0 / scale;
|
||||
if w >= 1.0 {
|
||||
return unit_uv();
|
||||
}
|
||||
let x = (nx - w * 0.5).clamp(0.0, 1.0 - w);
|
||||
let y = (ny - w * 0.5).clamp(0.0, 1.0 - w);
|
||||
Rect::from_min_size(pos2(x, y), vec2(w, w))
|
||||
}
|
||||
|
||||
fn zoom_frame(slide: Rect, uv: Rect) -> Rect {
|
||||
Rect::from_min_size(
|
||||
pos2(slide.min.x + uv.min.x * slide.width(), slide.min.y + uv.min.y * slide.height()),
|
||||
vec2(uv.width() * slide.width(), uv.height() * slide.height()),
|
||||
)
|
||||
}
|
||||
|
||||
fn toggle_blank(show: &mut Show, color: Color32) {
|
||||
show.blank = if show.blank == Some(color) { None } else { Some(color) };
|
||||
}
|
||||
|
||||
fn tool_bar_rect(full: Rect) -> Rect {
|
||||
let w = TOOL_BAR_W.min((full.width() - 32.0).max(32.0));
|
||||
Rect::from_min_size(pos2(full.min.x + 16.0, full.max.y - 50.0), vec2(w, 34.0))
|
||||
}
|
||||
|
||||
fn grid_indices(n: usize) -> Vec<usize> {
|
||||
(0..n.min(GRID_CAP)).collect()
|
||||
}
|
||||
|
||||
/// Thumbnail rectangles for `n` slides inside `full`, largest 16:9-style thumbs that fit.
|
||||
fn see_all_cells(full: Rect, n: usize, aspect: f32) -> Vec<Rect> {
|
||||
if n == 0 || full.width() < 16.0 || full.height() < 16.0 {
|
||||
return vec![];
|
||||
}
|
||||
let aspect = if aspect.is_finite() && aspect > 0.05 { aspect } else { 16.0 / 9.0 };
|
||||
let margin = 28.0;
|
||||
let gap = 16.0;
|
||||
let label_h = 22.0;
|
||||
let inner = full.shrink(margin);
|
||||
let inner = Rect::from_min_max(pos2(inner.min.x, inner.min.y + 36.0), inner.max);
|
||||
if inner.width() < 8.0 || inner.height() < 8.0 {
|
||||
return vec![];
|
||||
}
|
||||
let mut best: Vec<Rect> = vec![];
|
||||
let mut best_area = 0.0_f32;
|
||||
for cols in 1..=n.min(8) {
|
||||
let rows = n.div_ceil(cols);
|
||||
let cell_w = (inner.width() - gap * (cols.saturating_sub(1) as f32)) / cols as f32;
|
||||
let cell_h = (inner.height() - gap * (rows.saturating_sub(1) as f32)) / rows as f32;
|
||||
if cell_w < 8.0 || cell_h < label_h + 8.0 {
|
||||
continue;
|
||||
}
|
||||
let thumb_max_h = cell_h - label_h;
|
||||
let mut tw = cell_w;
|
||||
let mut th = tw / aspect;
|
||||
if th > thumb_max_h {
|
||||
th = thumb_max_h;
|
||||
tw = th * aspect;
|
||||
}
|
||||
if tw < 8.0 || th < 8.0 {
|
||||
continue;
|
||||
}
|
||||
let area = tw * th;
|
||||
if area <= best_area {
|
||||
continue;
|
||||
}
|
||||
best_area = area;
|
||||
best = (0..n)
|
||||
.map(|i| {
|
||||
let c = i % cols;
|
||||
let r = i / cols;
|
||||
let ox = inner.min.x + c as f32 * (cell_w + gap) + (cell_w - tw) * 0.5;
|
||||
let oy = inner.min.y + r as f32 * (cell_h + gap);
|
||||
Rect::from_min_size(pos2(ox, oy), vec2(tw, th))
|
||||
})
|
||||
.collect();
|
||||
}
|
||||
best
|
||||
}
|
||||
|
||||
fn see_all_hit(full: Rect, n: usize, aspect: f32, p: Pos2) -> Option<usize> {
|
||||
see_all_cells(full, n, aspect).into_iter().position(|r| r.expand2(vec2(4.0, 18.0)).contains(p))
|
||||
}
|
||||
|
||||
fn norm_on_slide(srect: Rect, uv: Rect, p: Pos2) -> Option<(f32, f32)> {
|
||||
if srect.width() <= 1.0 || srect.height() <= 1.0 || !srect.contains(p) {
|
||||
return None;
|
||||
}
|
||||
let u = (p.x - srect.min.x) / srect.width();
|
||||
let v = (p.y - srect.min.y) / srect.height();
|
||||
let nx = uv.min.x + u * uv.width();
|
||||
let ny = uv.min.y + v * uv.height();
|
||||
(nx.is_finite() && ny.is_finite()).then_some((nx.clamp(0.0, 1.0), ny.clamp(0.0, 1.0)))
|
||||
}
|
||||
|
||||
fn slide_to_screen(srect: Rect, uv: Rect, nx: f32, ny: f32) -> Pos2 {
|
||||
let u = (nx - uv.min.x) / uv.width().max(1e-4);
|
||||
let v = (ny - uv.min.y) / uv.height().max(1e-4);
|
||||
pos2(srect.min.x + u * srect.width(), srect.min.y + v * srect.height())
|
||||
}
|
||||
|
||||
fn slide_box(srect: Rect, uv: Rect, slide_w: f32, slide_h: f32, x: f32, y: f32, w: f32, h: f32) -> Rect {
|
||||
let a = slide_to_screen(srect, uv, x / slide_w.max(1.0), y / slide_h.max(1.0));
|
||||
let b = slide_to_screen(srect, uv, (x + w) / slide_w.max(1.0), (y + h) / slide_h.max(1.0));
|
||||
Rect::from_min_max(a, b)
|
||||
}
|
||||
|
||||
fn paint_grid(painter: &egui::Painter, ctx: &egui::Context, show: &mut Show, doc: &Presentation, full: Rect) {
|
||||
let slides = grid_indices(doc.slides.len());
|
||||
let aspect = slide_aspect(doc);
|
||||
let cells = see_all_cells(full, slides.len(), aspect);
|
||||
painter.rect_filled(full, CornerRadius::ZERO, Color32::from_gray(16));
|
||||
painter.text(pos2(full.center().x, full.min.y + 28.0), Align2::CENTER_CENTER, "All slides", theme::font(20.0), Color32::WHITE);
|
||||
if doc.slides.len() > GRID_CAP {
|
||||
painter.text(
|
||||
pos2(full.center().x, full.min.y + 50.0),
|
||||
Align2::CENTER_CENTER,
|
||||
format!("First {GRID_CAP} slides"),
|
||||
theme::font(13.0),
|
||||
Color32::from_gray(180),
|
||||
);
|
||||
}
|
||||
let budget = if slides.len() <= 12 { 12 } else { 4 };
|
||||
let mut made = 0;
|
||||
for (i, rect) in slides.iter().copied().zip(cells) {
|
||||
painter.rect_filled(rect, CornerRadius::same(4), Color32::from_gray(32));
|
||||
let tex = match show.thumbs.iter().find(|(k, _)| *k == i).map(|(_, t)| t.clone()) {
|
||||
Some(t) => Some(t),
|
||||
None if made < budget => {
|
||||
made += 1;
|
||||
render_thumb(ctx, show, doc, i)
|
||||
}
|
||||
None => {
|
||||
ctx.request_repaint();
|
||||
None
|
||||
}
|
||||
};
|
||||
if let Some(t) = tex {
|
||||
painter.image(t.id(), rect, unit_uv(), Color32::WHITE);
|
||||
}
|
||||
let current = i == show.state.slide;
|
||||
painter.rect_stroke(
|
||||
rect,
|
||||
CornerRadius::same(4),
|
||||
Stroke::new(if current { 3.0 } else { 1.0 }, if current { Color32::WHITE } else { Color32::from_gray(70) }),
|
||||
egui::StrokeKind::Inside,
|
||||
);
|
||||
let hidden = doc.slides.get(i).is_some_and(|s| s.hidden);
|
||||
let label = if hidden { format!("{} Hidden", i + 1) } else { format!("{}", i + 1) };
|
||||
painter.text(
|
||||
pos2(rect.center().x, rect.max.y + 12.0),
|
||||
Align2::CENTER_CENTER,
|
||||
label,
|
||||
theme::font(13.0),
|
||||
if current { Color32::WHITE } else { Color32::from_gray(180) },
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
fn render_thumb(ctx: &egui::Context, show: &mut Show, doc: &Presentation, i: usize) -> Option<TextureHandle> {
|
||||
if show.thumbs.len() >= GRID_CAP {
|
||||
return None;
|
||||
}
|
||||
let w = 320.0_f64;
|
||||
let h = (w * doc.slide_size.height / doc.slide_size.width.max(1.0)).round().max(1.0);
|
||||
let img = deckcraft_render::render_slide(
|
||||
doc,
|
||||
i,
|
||||
&RenderOpts { scale: w / doc.slide_size.width.max(1.0), size: Some((w as u32, h as u32)), ..Default::default() },
|
||||
);
|
||||
let tex = ctx.load_texture(format!("show-grid-{i}"), crate::textures::to_color_image(&img, false), egui::TextureOptions::LINEAR);
|
||||
show.thumbs.push((i, tex.clone()));
|
||||
Some(tex)
|
||||
}
|
||||
|
||||
fn presenter_window(ctx: &egui::Context, show: &mut Show, doc: &Presentation, now: f64, keep: &mut bool) {
|
||||
let cur = show.state.slide;
|
||||
let next = deckcraft_anim::show_order(doc).into_iter().find(|i| *i > cur);
|
||||
@@ -1203,7 +1587,21 @@ fn presenter_window(ctx: &egui::Context, show: &mut Show, doc: &Presentation, no
|
||||
}
|
||||
});
|
||||
});
|
||||
ui.add_space(10.0);
|
||||
ui.horizontal(|ui| {
|
||||
if ui.button(if show.blank == Some(Color32::BLACK) { "Black on" } else { "Black" }).clicked() {
|
||||
toggle_blank(show, Color32::BLACK);
|
||||
}
|
||||
if ui.button(if show.blank == Some(Color32::WHITE) { "White on" } else { "White" }).clicked() {
|
||||
toggle_blank(show, Color32::WHITE);
|
||||
}
|
||||
if ui.button(if show.grid { "All slides on" } else { "All slides" }).clicked() {
|
||||
show.grid = !show.grid;
|
||||
}
|
||||
if ui.button(show.zoom_label()).clicked() {
|
||||
show.zoom_key();
|
||||
}
|
||||
});
|
||||
ui.add_space(8.0);
|
||||
let avail = ui.available_rect_before_wrap();
|
||||
let left = Rect::from_min_max(avail.min, pos2(avail.min.x + avail.width() * 0.62, avail.max.y));
|
||||
let right = Rect::from_min_max(pos2(left.max.x + 16.0, avail.min.y), avail.max);
|
||||
@@ -1212,6 +1610,24 @@ fn presenter_window(ctx: &egui::Context, show: &mut Show, doc: &Presentation, no
|
||||
if let Some(t) = &cur_tex {
|
||||
ui.painter().image(t.id(), cr, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
|
||||
}
|
||||
if let Some(z) = show.zoom {
|
||||
let mark = zoom_frame(cr, z.uv());
|
||||
ui.painter().rect_stroke(mark, CornerRadius::ZERO, Stroke::new(2.0, Color32::WHITE), egui::StrokeKind::Inside);
|
||||
}
|
||||
if show.zoom_arm {
|
||||
let hit = ui.interact(cr, ui.id().with("presenter_zoom"), Sense::click());
|
||||
if hit.clicked()
|
||||
&& let Some(p) = hit.interact_pointer_pos()
|
||||
&& cr.width() > 1.0
|
||||
&& cr.height() > 1.0
|
||||
{
|
||||
show.zoom = Some(Zoom::at((p.x - cr.min.x) / cr.width(), (p.y - cr.min.y) / cr.height()));
|
||||
show.zoom_arm = false;
|
||||
}
|
||||
}
|
||||
if let Some(c) = show.blank {
|
||||
ui.painter().rect_filled(cr, CornerRadius::ZERO, c);
|
||||
}
|
||||
let nr = Rect::from_min_size(
|
||||
right.min + vec2(0.0, 22.0),
|
||||
vec2(right.width(), right.width() * (doc.slide_size.height / doc.slide_size.width.max(1.0)) as f32),
|
||||
@@ -1470,4 +1886,61 @@ mod tests {
|
||||
assert_eq!((show.state.step, show.state.playing), (0, false));
|
||||
assert!(matches!(show.state.next(&doc), ShowAction::PlayStep(0)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn zoom_stays_on_the_slide_and_the_grid_hits_a_thumbnail() {
|
||||
let uv = zoom_uv(0.5, 0.5, 2.0);
|
||||
assert!((uv.min.x - 0.25).abs() < 1e-4 && (uv.min.y - 0.25).abs() < 1e-4);
|
||||
assert!((uv.width() - 0.5).abs() < 1e-4);
|
||||
let corner = zoom_uv(0.0, 0.0, 2.0);
|
||||
assert_eq!(corner.min, pos2(0.0, 0.0));
|
||||
assert!(corner.max.x <= 1.0 && corner.max.y <= 1.0);
|
||||
let full = Rect::from_min_size(Pos2::ZERO, vec2(1728.0, 1084.0));
|
||||
let cells = see_all_cells(full, 7, 16.0 / 9.0);
|
||||
assert_eq!(cells.len(), 7);
|
||||
for (i, a) in cells.iter().enumerate() {
|
||||
assert!(full.contains_rect(*a), "cell {i} leaves the window");
|
||||
for b in cells.iter().skip(i + 1) {
|
||||
let overlap = a.intersect(*b);
|
||||
assert!(overlap.width() < 1.0 || overlap.height() < 1.0, "thumbnails overlap {a:?} {b:?}");
|
||||
}
|
||||
}
|
||||
let hit = see_all_hit(full, 7, 16.0 / 9.0, cells[3].center());
|
||||
assert_eq!(hit, Some(3));
|
||||
assert_eq!(see_all_hit(full, 7, 16.0 / 9.0, pos2(2.0, 2.0)), None);
|
||||
let srect = Rect::from_min_size(pos2(10.0, 20.0), vec2(200.0, 100.0));
|
||||
assert_eq!(norm_on_slide(srect, unit_uv(), pos2(110.0, 70.0)), Some((0.5, 0.5)));
|
||||
let zoomed = zoom_uv(0.5, 0.5, 2.0);
|
||||
let back = norm_on_slide(srect, zoomed, pos2(110.0, 70.0)).expect("on the slide");
|
||||
assert!((back.0 - 0.5).abs() < 1e-3 && (back.1 - 0.5).abs() < 1e-3);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn escape_leaves_the_grid_then_the_zoom_and_blank_toggles() {
|
||||
let mut s = deckcraft_engine::Session::with_new();
|
||||
s.execute("slide.new", &json!({})).unwrap();
|
||||
let doc = s.active().unwrap().doc.clone();
|
||||
let mut show = Show::new(&doc, 0, false, true);
|
||||
show.grid = true;
|
||||
show.zoom = Some(Zoom::at(0.2, 0.3));
|
||||
assert!(show.back_out());
|
||||
assert!(!show.grid);
|
||||
assert!(show.zoom.is_some(), "closing the grid leaves the zoom");
|
||||
assert!(show.back_out());
|
||||
assert!(show.zoom.is_none());
|
||||
assert!(!show.back_out());
|
||||
show.zoom_key();
|
||||
assert!(show.zoom_arm);
|
||||
show.zoom_key();
|
||||
assert!(!show.zoom_arm);
|
||||
toggle_blank(&mut show, Color32::BLACK);
|
||||
assert_eq!(show.blank_name(), Some("black"));
|
||||
toggle_blank(&mut show, Color32::WHITE);
|
||||
assert_eq!(show.blank_name(), Some("white"));
|
||||
toggle_blank(&mut show, Color32::WHITE);
|
||||
assert_eq!(show.blank_name(), None);
|
||||
show.zoom = Some(Zoom::at(0.4, 0.6));
|
||||
assert!(show.apply(ShowAction::Slide(1), &doc, 1.0));
|
||||
assert!(show.zoom.is_none(), "a new slide is shown whole");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,10 +15,12 @@ Coordinates are slide points (1/72 inch; a 16:9 slide is 960 × 540) unless note
|
||||
| `engine.execute` / `ui.menu.invoke` / `command` | `{command, params}` | Run any command (see `engine.commands`; `deckcraft-cli describe ID` documents one) |
|
||||
| `engine.commands` | — | Every command: id, label, menu path, shortcut, params doc, enabled / disabled reason |
|
||||
| `document.inspect` | — | Slides, sections, layouts, shapes, selection |
|
||||
| `ui.inspect` | — | UI state, active tool, window/canvas/slide rects, dialog, `home` (the File tab open over a presentation), `backstage` (its page, also the start screen), slide show state, documents, perf (fps, render ms) |
|
||||
| `ui.inspect` | — | UI state, active tool, window/canvas/slide rects, dialog, `home` (the File tab open over a presentation), `backstage` (its page, also the start screen), slide show state (`grid`, `zoomArm`, `zoom`, `blank`; `cells` while See All Slides is open), documents, perf (fps, render ms) |
|
||||
| `ui.tool.select` | `{tool, preset?}` | `select`, `text`, `shape` + preset, any preset name, `curve`, `freeform`, `scribble`, `pen`, `highlighter`, `eraser` |
|
||||
| `ui.pointer` | `{events: [{kind: down\|drag\|up\|move\|doubleclick\|tripleclick\|contextclick, x, y, mods?}], mods?}` | Drive the active tool in slide points through the same code path as the mouse (`contextclick`: the right-button press that selects before the context menu) |
|
||||
| `ui.key` / `ui.text` | `{key, shift?, alt?, cmd?}` / `{text}` | Keyboard input (also drives a running slide show) |
|
||||
| `ui.pointer` | `{events: [{kind: down\|drag\|up\|move\|doubleclick\|tripleclick, x, y, mods?}], mods?}` | Drive the active tool in slide points through the same code path as the mouse |
|
||||
| `ui.key` / `ui.text` | `{key, shift?, alt?, cmd?}` / `{text}` | Keyboard input (also drives a running slide show: G is See All Slides, Z arms zoom, Esc closes those before it leaves the show) |
|
||||
| `ui.ime` | `{preedit, active?: [start, end]}` / `{commit}` | An input method's composition through egui, as a real one arrives: shown in place on the slide or in a focused field; `{"preedit": ""}` cancels |
|
||||
| `ui.move` / `ui.click` / `ui.drag` | screen points | Real egui pointer input — reaches every widget, menu and pane |
|
||||
| `ui.set` | `{tab?, view?, pane?, notes?, zoom?, brightness?, ruler?, gridlines?, guides?, …}` | UI state (returns the full state) |
|
||||
|
||||
+3
-1
@@ -10,6 +10,7 @@
|
||||
> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-14 · **Change:** trivial (Review previous/next comment; previous: minor, core-workflow alpha gate) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
|
||||
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-14 · **Change:** minor (six original starter decks; the large template gallery stays after beta; previous: minor, core-workflow alpha gate added; stage stays alpha) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
|
||||
> **Last reviewed:** 2026-10-13 · **Last updated:** 2026-10-13 · **Change:** trivial (owned PPTX corpus covers more deck kinds; handout-master text kept; previous: minor, core-workflow alpha gate) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
|
||||
> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-14 · **Change:** trivial (show: See All Slides and zoom; previous: minor, core-workflow alpha gate) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
|
||||
|
||||
Forward-looking: where DeckCraft is going and in what order. The one-page summary is
|
||||
[ROADMAP.md](../ROADMAP.md); every shortfall is in [gaps.md](gaps.md); numbers are in
|
||||
@@ -26,7 +27,7 @@ points and lead the beta plan.
|
||||
|---|---|---|---|
|
||||
| Build a deck from scratch (theme, layouts, titles and bullets, shapes, pictures from file), save, close and reopen it | yes | Commands for all of it; `.deckcraft` and `.pptx` round-trip tests (`crates/pptx/tests/roundtrip.rs`, `crates/format`); AutoRecover. Close discards edits without asking (#60, PR #75); image *paste* fails on Windows/Linux (#53), though insert-from-file works | 1–3 |
|
||||
| Open a colleague's `.pptx`, edit it, save it back as `.pptx` that PowerPoint opens | partial (not blocking) | The reader is lenient and keeps unknown objects. Files open in PowerPoint without repair (checked 2026-10-06). But only generated decks have been tested; text inside EMF/WMF pictures is missing; comment threads, media options and rewind are lost (#70, #74, #77) | 31–55 |
|
||||
| Present: full-screen show with transitions, animations, media, presenter view with notes, next slide and timer | yes | 48/48 transitions, 64 effects, triggers, builds, media playback, presenter window. Presenter view isn't placed on the second display automatically (drag it there) | 3–5 |
|
||||
| Present: full-screen show with transitions, animations, media, presenter view with notes, next slide and timer | yes | 48/48 transitions, 64 effects, triggers, builds, media playback, presenter window, See All Slides and zoom. Presenter view isn't placed on the second display automatically (drag it there) | 3–5 |
|
||||
| Add business content: tables, charts with their data, simple diagrams | partial (not blocking) | Tables with styles, merge/split, all D or P. Charts insert with the common types and edit data in the Chart Data dialog (P0 partial); SmartArt is basic (pre-drawn shapes) | 12–20 |
|
||||
| Share the deck: PDF of slides, notes or handouts; images | yes | `file.export` PDF with text layer, links, bookmarks, handouts 1–9; PNG/JPEG. Artwork is raster in the PDF; no direct print (print the PDF) | 10–16 |
|
||||
| Review: comments with replies, resolve, spelling | partial (not blocking) | Comments, replies and resolve work and survive `.deckcraft` and `.pptx` (#70); spelling is a small built-in list | 4–8 |
|
||||
@@ -152,5 +153,6 @@ plan above.
|
||||
| 2026-10-14 | trivial | Review workflow: previous and next comment across the deck |
|
||||
| 2026-10-14 | minor | After beta: six original starter decks exist; a larger template gallery remains |
|
||||
| 2026-10-13 | trivial | Owned PPTX corpus covers tables, charts, animations, media, sections and masters; handout-master text kept. Beta item 2 stays open for a larger corpus |
|
||||
| 2026-10-14 | trivial | Present workflow notes See All Slides and zoom |
|
||||
| 2026-10-10 | minor | Added the alpha gate (six core workflows): all pass, two with partial depth; stage stays alpha |
|
||||
| 2026-10-10 | major | Created: current focus, ranked beta plan with hours, milestones M0–M14 with status, the old alpha checklist as history |
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
> **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)
|
||||
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-13 · **Change:** minor (laser pointer in the show; the presenter window still does not move it; previous: major, created) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
|
||||
> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-14 · **Change:** trivial (Show Media Controls hides the show's playback bar and GIF button; breadth stays 66%) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
|
||||
> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-14 · **Change:** minor (See All Slides and zoom during the show; black and white from the presenter window; previous: major, created) · **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
|
||||
@@ -35,6 +36,8 @@ ready** (estimated), **10–16 h** to parity.
|
||||
| Animated GIFs play; pause from their corner button | yes | yes (#39) | The corner button hides with Show Media Controls |
|
||||
| See All Slides grid during the show | yes | no | |
|
||||
| Zoom into part of a slide during the show | yes | no | |
|
||||
| See All Slides grid during the show | yes | yes: G, or All on the show bar and in presenter view; click a thumbnail, Esc closes the grid | Hidden slides are labelled; the first 48 slides are shown |
|
||||
| Zoom into part of a slide during the show | yes | yes: Z, then click the slide (or the presenter slide); 2×, Esc or another click leaves it | The presenter keeps the whole slide and draws a frame on the zoomed part |
|
||||
| Pen and highlighter ink | yes | pen only (Cmd+P pen, Cmd+A arrow, E erases all ink) | No highlighter, per-stroke eraser, ink colours, or keep/discard annotations prompt |
|
||||
| Laser pointer | yes | yes in the show | Cmd/Ctrl+L and the on-screen button draw the show's laser colour and leave no ink. The presenter window does not move that dot |
|
||||
| Subtitles and live captions | yes (cloud speech) | no | AI dimension |
|
||||
@@ -54,8 +57,8 @@ ready** (estimated), **10–16 h** to parity.
|
||||
| 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 | |
|
||||
| Pen, laser, black screen, zoom from presenter view | yes | keys only | |
|
||||
| See all slides from presenter view | yes | no | |
|
||||
| Pen, laser, black screen, zoom from presenter view | yes | Black, White and Zoom buttons; the audience zoom is framed on the presenter slide | Pen and the laser pointer are still keys only; there is no laser yet |
|
||||
| See all slides from presenter view | yes | yes: All slides opens the grid on the show | |
|
||||
| Rehearse with Coach (Speaker Coach) | yes (cloud) | no | AI dimension |
|
||||
|
||||
## Rehearse and record
|
||||
@@ -78,8 +81,9 @@ Reading View in a window with navigation: present (checklist row done).
|
||||
| Presenter view on the right display, swap displays, pause/reset timer, clock, notes size | 3–5 |
|
||||
| Highlighter, eraser, keep-annotations prompt, laser from presenter view | 2–4 |
|
||||
| See All Slides and zoom during the show | 2–3 |
|
||||
| Laser pointer, highlighter, eraser, keep-annotations prompt | 2–4 |
|
||||
| Record slide show with narration (no camera) | 5–8 |
|
||||
| **Total** | **~12–20** (the slide-show row of the feature table carries 10–16 h; recording overlaps the Media row) |
|
||||
| **Total** | **~10–17** (the slide-show row of the feature table carries 10–16 h; recording overlaps the Media row) |
|
||||
|
||||
## Revision history
|
||||
|
||||
@@ -91,4 +95,5 @@ Reading View in a window with navigation: present (checklist row done).
|
||||
| 2026-10-11 | minor | Media effects (Play, Pause, Stop) in the click sequence play with their step (#116) |
|
||||
| 2026-10-13 | minor | The show has a laser pointer (Cmd/Ctrl+L, the show's laser colour, no ink). Presenter view still does not drive it |
|
||||
| 2026-10-14 | trivial | Show Media Controls hides the show's playback bar and GIF button |
|
||||
| 2026-10-14 | minor | See All Slides (G) and click-to-zoom (Z) during the show. Presenter view opens that grid and sets black, white and zoom. Checklist breadth stays 66% |
|
||||
| 2026-10-10 | major | Created: show, presenter view, rehearse and record, compared with PowerPoint 16.113's Slide Show tab and menu |
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-14 · **Change:** trivial (227 commands; breadth stays 79%, ready stays ~55%; previous: minor, hours to ~95% per audience) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
|
||||
> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-14 · **Change:** trivial (228 commands; previous/next comment; breadth stays 79%; previous: minor, hours to ~95%) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
|
||||
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-14 · **Change:** minor (six original starter decks; ecosystem stays ~25% until the gallery is large; previous: minor, hours to ~95% per audience added; ready 56% → 55%) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
|
||||
> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-14 · **Change:** trivial (slide show lists See All Slides and zoom; breadth stays 79%; previous: minor, hours to ~95% per audience) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
|
||||
|
||||
The authoritative answer to "how close is DeckCraft to PowerPoint, and how much work is left?".
|
||||
[ROADMAP.md](../ROADMAP.md) summarizes it; [gaps.md](gaps.md) itemizes every shortfall;
|
||||
@@ -232,9 +233,9 @@ Carried from the 2026-10-07 ROADMAP status and updated with what has landed sinc
|
||||
- **Transitions and animations:** 48 transitions including Morph (objects, words, characters,
|
||||
geometry outlines), 64 animation effects (entrance, emphasis, exit, motion paths, media),
|
||||
triggers, by-paragraph builds, Animation Painter, on a shared timeline engine.
|
||||
- **Slide show:** full screen, keyboard/mouse navigation, blank screens, go-to-slide, pen,
|
||||
presenter window, rehearse timings, custom shows, Set Up Show, Reading View; links and shape
|
||||
actions followed on click.
|
||||
- **Slide show:** full screen, keyboard/mouse navigation, blank screens, go-to-slide, See All
|
||||
Slides, click-to-zoom, pen, presenter window (black, white, zoom and the slide grid), rehearse
|
||||
timings, custom shows, Set Up Show, Reading View; links and shape actions followed on click.
|
||||
- **Views:** Normal, Outline, Slide Sorter, Notes Page, Reading View, Slide Master; zoom;
|
||||
grayscale.
|
||||
- **Review:** comments with replies and resolve, previous and next across the deck, accessibility checker, a basic spelling list.
|
||||
@@ -287,6 +288,7 @@ scored done (16 open issues).
|
||||
| 2026-10-14 | trivial | Size and Position dialog. Command count 226 → 227. Breadth stays 79%, ready stays ~55%, UI stays ~60% |
|
||||
| 2026-10-14 | trivial | 228 commands; Review lists previous and next comment. Breadth stays 79%; the comments checklist row stays D |
|
||||
| 2026-10-14 | minor | Ecosystem evidence: six original starter decks. The dimension stays ~25% because PowerPoint's large gallery is still absent |
|
||||
| 2026-10-14 | trivial | Slide show evidence includes See All Slides and zoom. Breadth stays 79% |
|
||||
| 2026-10-10 | minor | Added the readiness-by-audience table: each number gets its own hours to ~95% (full 340–600, mainstream 150–250, essentials 50–90). The full number stays an additive weighted sum; no change to the percentages |
|
||||
| 2026-10-10 | minor | Added the mainstream practitioner (~53%) and essentials user (~62%) numbers with written weights, discounts and user evidence. Features dimension recomputed from written area weights (66% judgement → 62.4% weighted mean), which moves ready for real work from ~56% to ~55%; stage unchanged |
|
||||
| 2026-10-10 | minor | Stage checked against the core-workflow gate (all six pass); stays alpha |
|
||||
|
||||
Reference in New Issue
Block a user