Merge remote-tracking branch 'upstream/main' into fix/pptx-media-timing-nodes

This commit is contained in:
Neil Cawse committed 2026-11-14 18:04:25 +00:00
commit e4e6f4da3b
2 files changed
+3 -1

No files matched your search

+1
View File
@@ -72,6 +72,7 @@ impl SlideApp {
synthetic_injected_time: None,
ribbon_scroll: HashMap::new(),
show_instance: 0,
#[cfg(not(target_arch = "wasm32"))]
opening_generation: 0,
canvas_rect: None,
eyedropper: None,
+2 -1
View File
@@ -276,7 +276,8 @@ pub struct SlideApp {
ribbon_scroll: HashMap<String, u32>,
/// Monotonic identity for a new slide show instance (`start_show`).
show_instance: u64,
/// Monotonic identity for a new background-open attempt.
/// Monotonic identity for a new background-open attempt (the web build has no threads).
#[cfg(not(target_arch = "wasm32"))]
opening_generation: u64,
/// Canvas screen rect and points-per-slide-point scale (for control & tests).
pub canvas_rect: Option<egui::Rect>,