mirror of
https://github.com/storytold/figcraft.git
synced 2026-11-17 23:58:24 +00:00
Merge pull request #2419 from faridulhq/zoom-refine-after-pause
M8: the desktop refines a zoom only once it pauses
This commit is contained in:
3 files changed
+52
-8
No files matched your search
@@ -32,9 +32,9 @@ use web_time::Instant;
|
||||
pub const PREVIEW_FACTOR: f64 = 4.0;
|
||||
/// Full renders quicker than this (about a frame) show without a preview.
|
||||
pub const PREVIEW_AFTER_MS: f64 = 12.0;
|
||||
/// The browser refines a zoom's preview only once no newer request came for this long (or for as
|
||||
/// long as the last full render took, when shorter): a full render there blocks the page, and one
|
||||
/// between every two wheel steps of a zoom held it up for seconds.
|
||||
/// A zoom's preview is refined only once no newer request came for this long (or for as long as
|
||||
/// the last full render took, when shorter): in the browser a full render blocks the page, and on
|
||||
/// the desktop it can't be stopped, so one between every two wheel steps of a zoom held it up.
|
||||
pub const SETTLE_MS: u64 = 120;
|
||||
/// The browser draws a full render a band at a time ([`figcraft_render::Steps`]): at least one
|
||||
/// band a frame, and more while they fit in this long, so input is handled while it draws. A
|
||||
@@ -481,10 +481,19 @@ impl Worker {
|
||||
break;
|
||||
}
|
||||
ctx.request_repaint_of(viewport);
|
||||
// A newer request makes refining this one moot: it gets its own preview.
|
||||
if let Ok(newer) = jobs.try_recv() {
|
||||
next = Some(newer);
|
||||
continue;
|
||||
// A newer request makes refining this one moot: it gets its own preview. Wait
|
||||
// for one as the browser does ([`SETTLE_MS`], or the last full render's time
|
||||
// when shorter): a full render can't be stopped, so one started between two
|
||||
// steps of a zoom held every later step up for as long as it took.
|
||||
let wait = std::time::Duration::try_from_secs_f64(renders.full_ms_so_far() / 1000.0)
|
||||
.map_or(std::time::Duration::ZERO, |full| full.min(std::time::Duration::from_millis(SETTLE_MS)));
|
||||
match jobs.recv_timeout(wait) {
|
||||
Ok(newer) => {
|
||||
next = Some(newer);
|
||||
continue;
|
||||
}
|
||||
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {}
|
||||
Err(std::sync::mpsc::RecvTimeoutError::Disconnected) => break,
|
||||
}
|
||||
}
|
||||
if renders.wants_late_preview(&job) {
|
||||
|
||||
@@ -405,6 +405,34 @@ fn a_slow_first_render_gets_a_preview_beside_it_and_a_quick_one_none() {
|
||||
assert_eq!(drain(&mut w), [(1, false)], "done before the threshold: no preview");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_render_thread_refines_a_zoom_only_once_it_pauses() {
|
||||
// A full render can't be stopped: a zoom step's started as soon as its preview was out held the
|
||||
// next step up for as long as it took. The next step coming while the preview shows skips it.
|
||||
let views: Vec<View> = [1.0, 0.5, 0.25].into_iter().map(|s| view_at((300.0, 200.0), s, 1200, 1200)).collect();
|
||||
let s = slow_scene(&views, 4.0 * PREVIEW_AFTER_MS);
|
||||
let ds = s.ds().unwrap();
|
||||
let at = |i: usize| job(&ds.doc, ds.page, ds.uid, views[i].clone());
|
||||
let mut w = Worker::new(egui::Context::default());
|
||||
w.submit(at(0));
|
||||
drain(&mut w);
|
||||
// A zoom out: its preview, then the next step while that preview is on screen.
|
||||
w.submit(at(1));
|
||||
let start = std::time::Instant::now();
|
||||
let preview = loop {
|
||||
assert!(start.elapsed() < Duration::from_secs(60), "no preview came");
|
||||
if let Some(d) = w.poll() {
|
||||
break d;
|
||||
}
|
||||
std::thread::sleep(Duration::from_millis(1));
|
||||
};
|
||||
assert_eq!((preview.seq, preview.coarse), (2, true));
|
||||
w.submit(at(2));
|
||||
let got = drain(&mut w);
|
||||
assert!(!got.contains(&(2, false)), "the step zoomed past is never refined: {got:?}");
|
||||
assert_eq!(got.last(), Some(&(3, false)), "the last step is: {got:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_preview_replaces_a_refined_image_of_the_same_zoom_elsewhere_on_the_page() {
|
||||
// 800 × 600: A at 100% from the page origin, B at 800% about its top-left, A' back at 100%
|
||||
|
||||
+8
-1
@@ -1,6 +1,6 @@
|
||||
# Where FigCraft falls short of Figma
|
||||
|
||||
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-12 · **Change:** minor (gap 1: the `.fig` export writes vector region paints (#2302); gap 13: a boolean group's corner radius (#2222); gap 24: mind maps, first step: a first node with three children on curved branches, laid out again after every edit (`board.mindMap`, `board.mindMapAdd`, #2226); gap 10: library analytics list how many layers and files use each style and variable; the Controller menu names each button as PlayStation and Switch controllers do; gap 6: widgets draw lines and SVG pictures (plugin API 6); gap 7: text reads only the fallback fonts it draws with; a board connector's path can be reshaped by dragging its path handles (#1710); gap 10: library analytics count insertions and show insertions and detachments over time; gap 6: a widget opens its plugin's panel (plugin API 5), whose callbacks redraw it; the keyboard's Menu key opens the context menu, as Shift+F10 does; gap 14: a collection of this file extends, following its edits at once; colour picker review fixes for text undo, fitted sidebars, moving controls and gradient variables; gap 6: plugin widgets have hover styles; gap 7: the browser draws a zoom's full render a band at a time; `.fig` import keeps the file's saved line breaks while the text and its box are unedited (#1236); FigJam outer shape outlines and sticky body fallback beside author text (#1341, #1397); Arabic draft catalog; gap 7: the browser refines a zoom's preview once the zoom has paused; gap 17: branches in live sessions, branch history entries, the list-merge rows brought up to date; gap 6: plugin widgets take text input and a property menu (plugin API 4); gap 24: board templates and tables; gap 24: a shared timer and voting sessions; gap 24: the board dot grid, connector ends dragged to re-attach, curved connectors; egui/eframe 0.37 verified for gap 18; known gaps from the #1311 review in gaps 4, 14, 15 and 16; gap 16: measurements kept on the canvas, a read-only layers panel in Dev Mode; gap 24: boards and their tail; Dev Mode tail: import lines in layer trees, compare with versions, an inspect-only canvas; gap 5: reviewed Turkish, Czech and Indonesian drafts, the Japanese draft completed; reviewed Russian catalog and integer plurals; `.fig` export: instance sizes, variables with modes, shared styles, variable-width strokes; sharing with a join code; text box sizes measured against documents re-saved by other software; live sessions per document; .fig export checked by opening written files in other software; experimental .fig export; keyboard shortcut parity suite and bindings; Simplified Chinese draft catalog; Latin American Spanish overlay; prototyping tail: gamepad triggers, widgets in prototypes, mode lookups; plugin directory on figcraft-server; Japanese and Korean draft catalogs and CJK UI fonts; plugin widgets and the plugin panel tail; French, German and Brazilian Portuguese draft catalogs; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and edit tail; dev resources links; extended collections tail; branch version history and finer list merges; comments and version history behaviour suite and fixes; canvas navigation, guides and grids behaviour suite and fixes; `.fig` import: editable vector networks, more layer kinds, variable prototype actions; `.fig` import, best effort: gap 1 down to its tail; Windows QA pass: everyday workflows on Windows 11, eight fixes incl. unsaved work kept after a crash or a forced quit; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; localization layer with a draft Spanish catalog; hosting figcraft-server: wss in the desktop app, server releases, deployment guide; plugin panels and settings; canvas fixes: boolean hit testing on the result, group drags, frame outlines and slices; code connect; stretch and scatter brushes, pen pressure; text on a path and pattern fills; team libraries on the server and swap library; branches: create, update from main, review and merge; animated GIF fills and TIFF images; Open recent, outlines for the selection and mask outlines: menu breadth 100%; extended collections, variables import/export, gradient stop and variant bindings: gap 14 down to its tail; the 2026-10-17 landings: `.fig` import fidelity, budgets for large files, the import report, a `.fig` copy from Save as and paste from another design app (gap 1); menus, the Actions palette, editor fixes, Selection colors and smart-selection spacing (gap 4); catalog counts re-measured (gap 5); bounded canvas pan overscan) · **Target:** Figma Design (desktop app 126.10.7)
|
||||
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (gap 7: the desktop refines a zoom's preview once the zoom has paused; gap 1: the `.fig` export writes vector region paints (#2302); gap 13: a boolean group's corner radius (#2222); gap 24: mind maps, first step: a first node with three children on curved branches, laid out again after every edit (`board.mindMap`, `board.mindMapAdd`, #2226); gap 10: library analytics list how many layers and files use each style and variable; the Controller menu names each button as PlayStation and Switch controllers do; gap 6: widgets draw lines and SVG pictures (plugin API 6); gap 7: text reads only the fallback fonts it draws with; a board connector's path can be reshaped by dragging its path handles (#1710); gap 10: library analytics count insertions and show insertions and detachments over time; gap 6: a widget opens its plugin's panel (plugin API 5), whose callbacks redraw it; the keyboard's Menu key opens the context menu, as Shift+F10 does; gap 14: a collection of this file extends, following its edits at once; colour picker review fixes for text undo, fitted sidebars, moving controls and gradient variables; gap 6: plugin widgets have hover styles; gap 7: the browser draws a zoom's full render a band at a time; `.fig` import keeps the file's saved line breaks while the text and its box are unedited (#1236); FigJam outer shape outlines and sticky body fallback beside author text (#1341, #1397); Arabic draft catalog; gap 7: the browser refines a zoom's preview once the zoom has paused; gap 17: branches in live sessions, branch history entries, the list-merge rows brought up to date; gap 6: plugin widgets take text input and a property menu (plugin API 4); gap 24: board templates and tables; gap 24: a shared timer and voting sessions; gap 24: the board dot grid, connector ends dragged to re-attach, curved connectors; egui/eframe 0.37 verified for gap 18; known gaps from the #1311 review in gaps 4, 14, 15 and 16; gap 16: measurements kept on the canvas, a read-only layers panel in Dev Mode; gap 24: boards and their tail; Dev Mode tail: import lines in layer trees, compare with versions, an inspect-only canvas; gap 5: reviewed Turkish, Czech and Indonesian drafts, the Japanese draft completed; reviewed Russian catalog and integer plurals; `.fig` export: instance sizes, variables with modes, shared styles, variable-width strokes; sharing with a join code; text box sizes measured against documents re-saved by other software; live sessions per document; .fig export checked by opening written files in other software; experimental .fig export; keyboard shortcut parity suite and bindings; Simplified Chinese draft catalog; Latin American Spanish overlay; prototyping tail: gamepad triggers, widgets in prototypes, mode lookups; plugin directory on figcraft-server; Japanese and Korean draft catalogs and CJK UI fonts; plugin widgets and the plugin panel tail; French, German and Brazilian Portuguese draft catalogs; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and edit tail; dev resources links; extended collections tail; branch version history and finer list merges; comments and version history behaviour suite and fixes; canvas navigation, guides and grids behaviour suite and fixes; `.fig` import: editable vector networks, more layer kinds, variable prototype actions; `.fig` import, best effort: gap 1 down to its tail; Windows QA pass: everyday workflows on Windows 11, eight fixes incl. unsaved work kept after a crash or a forced quit; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; localization layer with a draft Spanish catalog; hosting figcraft-server: wss in the desktop app, server releases, deployment guide; plugin panels and settings; canvas fixes: boolean hit testing on the result, group drags, frame outlines and slices; code connect; stretch and scatter brushes, pen pressure; text on a path and pattern fills; team libraries on the server and swap library; branches: create, update from main, review and merge; animated GIF fills and TIFF images; Open recent, outlines for the selection and mask outlines: menu breadth 100%; extended collections, variables import/export, gradient stop and variant bindings: gap 14 down to its tail; the 2026-10-17 landings: `.fig` import fidelity, budgets for large files, the import report, a `.fig` copy from Save as and paste from another design app (gap 1); menus, the Actions palette, editor fixes, Selection colors and smart-selection spacing (gap 4); catalog counts re-measured (gap 5); bounded canvas pan overscan) · **Target:** Figma Design (desktop app 126.10.7)
|
||||
|
||||
Every known shortfall against Figma, one entry each, ranked by how much it stops a Figma user from
|
||||
doing real work in FigCraft. Agents: pick work from the top unless the owner says otherwise. The
|
||||
@@ -306,6 +306,12 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
|
||||
write lock, went from about 45 µs to 0.2 µs (the lookup logic timed alone). The faces drawn are
|
||||
those drawn before, except where two are equally near the run's style (the one read already is
|
||||
kept) and for Hiragino's W3-style names (read as their weight).
|
||||
- **Landed (2026-11-17):** the desktop's render thread waits the same way after a zoom's preview
|
||||
(`SETTLE_MS`, or the last full render's time when shorter) before refining it. A full render
|
||||
there can't be stopped, so one started between two steps of a held zoom made every later step
|
||||
wait for it: on a 29,000 × 12,600 page of 9,000 layers with images and shadows (M1 Pro, 2x
|
||||
display) full renders took 110–520 ms, and the preview stood in for that long. Pans and edits are
|
||||
refined at once, as before.
|
||||
- **Landed (2026-10-28):** the browser refines a zoom's preview only once no newer request has
|
||||
come for 120 ms (`SETTLE_MS`), or for as long as its last full render took when that is shorter:
|
||||
its full renders run on the UI thread, and one between every two wheel steps held the page up
|
||||
@@ -595,6 +601,7 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
|
||||
|
||||
| Date | Change | Summary |
|
||||
|---|---|---|
|
||||
| 2026-11-17 | minor | Gap 7: the desktop refines a zoom's preview only once the zoom has paused, as the browser does, so a full render that can't be stopped no longer holds up the next steps of a held zoom. Numbers unchanged. Test: `zoom_preview_tests::the_render_thread_refines_a_zoom_only_once_it_pauses` |
|
||||
| 2026-11-12 | minor | Gap 1: the `.fig` export writes vector region paints (#2302); the 2026-10-26 "Landed" bullet no longer says the export drops them |
|
||||
| 2026-11-10 | minor | Gap 13: a boolean group's corner radius rounds every sharp corner of its result (#2222); the boolean clause leaves the 2026-10-12 "Left" list |
|
||||
| 2026-11-10 | minor | Gap 24: mind maps, first step (`board.mindMap`, `board.mindMapAdd`; the map lays itself out again after every edit, #2226); the toolbar entry, shortcuts, drag to re-parent and `.jam` import are what is missing of them. |
|
||||
|
||||
Reference in new issue
Block a user