Merge branch 'master' into wip

This commit is contained in:
Matthias Koefferlein
2026-07-19 15:13:40 +02:00
17 changed files with 160 additions and 641 deletions
+3 -1
View File
@@ -855,7 +855,9 @@ LayoutCanvas::image_with_options (unsigned int width, unsigned int height, int l
lay::RedrawThread redraw_thread (&rd_canvas, mp_view);
// render the layout
redraw_thread.start (0 /*synchronous*/, m_layers, vp, resolution, font_resolution, true);
int workers = mp_view->synchronous () ? 0 : mp_view->drawing_workers ();
redraw_thread.start (workers, m_layers, vp, resolution, font_resolution, true);
redraw_thread.wait ();
redraw_thread.stop (); // safety
// paint the background objects. It uses "img" to paint on.