jess
/
Graphite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression where Vello doesn't render new document opened after closing all documents (#3849) 

* Fix regression where Vello doesn't render new document opened after closing all documents

* Remove last_svg_canvas and do this logic in the frontend
This commit is contained in:
Keavon Chambers 2026-03-05 01:54:31 -08:00 committed by GitHub
parent 8a1dfb9d8f
commit ead914ec2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/src/node_graph_executor.rs
View File

@ -5,8 +5,7 @@ use graph_craft::document::value::{RenderOutput, TaggedValue};
use graph_craft::document::{DocumentNode, DocumentNodeImplementation, NodeId, NodeInput}; use graph_craft::document::{DocumentNode, DocumentNodeImplementation, NodeId, NodeInput};
use graph_craft::proto::GraphErrors; use graph_craft::proto::GraphErrors;
use graph_craft::wasm_application_io::EditorPreferences; use graph_craft::wasm_application_io::EditorPreferences;
use graphene_std::application_io::{NodeGraphUpdateMessage, RenderConfig}; use graphene_std::application_io::{NodeGraphUpdateMessage, RenderConfig, TimingInformation};
use graphene_std::application_io::{SurfaceFrame, TimingInformation};
use graphene_std::raster::{CPU, Raster}; use graphene_std::raster::{CPU, Raster};
use graphene_std::renderer::{RenderMetadata, format_transform_matrix}; use graphene_std::renderer::{RenderMetadata, format_transform_matrix};
use graphene_std::text::FontCache; use graphene_std::text::FontCache;
@ -56,7 +55,6 @@ pub struct NodeGraphExecutor {
futures: VecDeque<(u64, ExecutionContext)>, futures: VecDeque<(u64, ExecutionContext)>,
node_graph_hash: u64, node_graph_hash: u64,
previous_node_to_inspect: Option<NodeId>, previous_node_to_inspect: Option<NodeId>,
last_svg_canvas: Option<SurfaceFrame>,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -79,7 +77,6 @@ impl NodeGraphExecutor {
node_graph_hash: 0, node_graph_hash: 0,
current_execution_id: 0, current_execution_id: 0,
previous_node_to_inspect: None, previous_node_to_inspect: None,
last_svg_canvas: None,
}; };
(node_runtime, node_executor) (node_runtime, node_executor)
} }
@ -384,19 +381,14 @@ impl NodeGraphExecutor {
// Send to frontend // Send to frontend
responses.add(FrontendMessage::UpdateImageData { image_data }); responses.add(FrontendMessage::UpdateImageData { image_data });
responses.add(FrontendMessage::UpdateDocumentArtwork { svg }); responses.add(FrontendMessage::UpdateDocumentArtwork { svg });
self.last_svg_canvas = None;
} }
RenderOutputType::CanvasFrame(frame) => 'block: { RenderOutputType::CanvasFrame(frame) => {
if self.last_svg_canvas == Some(frame) {
break 'block;
}
let matrix = format_transform_matrix(frame.transform); let matrix = format_transform_matrix(frame.transform);
let transform = if matrix.is_empty() { String::new() } else { format!(" transform=\"{matrix}\"") }; let transform = if matrix.is_empty() { String::new() } else { format!(" transform=\"{matrix}\"") };
let svg = format!( let svg = format!(
r#"<svg><foreignObject width="{}" height="{}"{transform}><div data-canvas-placeholder="{}" data-is-viewport="true"></div></foreignObject></svg>"#, r#"<svg><foreignObject width="{}" height="{}"{transform}><div data-canvas-placeholder="{}" data-is-viewport="true"></div></foreignObject></svg>"#,
frame.resolution.x, frame.resolution.y, frame.surface_id.0, frame.resolution.x, frame.resolution.y, frame.surface_id.0,
); );
self.last_svg_canvas = Some(frame);
responses.add(FrontendMessage::UpdateDocumentArtwork { svg }); responses.add(FrontendMessage::UpdateDocumentArtwork { svg });
} }
RenderOutputType::Texture { .. } => {} RenderOutputType::Texture { .. } => {}

8
frontend/src/components/panels/Document.svelte
View File

@ -185,9 +185,13 @@
const logicalWidth = parseFloat(foreignObject.getAttribute("width") || "0"); const logicalWidth = parseFloat(foreignObject.getAttribute("width") || "0");
const logicalHeight = parseFloat(foreignObject.getAttribute("height") || "0"); const logicalHeight = parseFloat(foreignObject.getAttribute("height") || "0");
// Clone canvas for repeated instances (layers that appear multiple times) // Viewport canvas is marked with data-is-viewport and should never be cloned.
// Viewport canvas is marked with data-is-viewport and should never be cloned // If it's already mounted in the viewport, skip the DOM replacement since it's already showing the rendered content.
// We check `canvas.isConnected` to ensure it's in the live DOM, not a detached tree from a destroyed component.
const isViewport = placeholder.hasAttribute("data-is-viewport"); const isViewport = placeholder.hasAttribute("data-is-viewport");
if (isViewport && canvas.isConnected && canvas.parentElement?.closest("[data-viewport]")) return;
// Clone canvas for repeated instances (layers that appear multiple times)
if (!isViewport && canvas.parentElement) { if (!isViewport && canvas.parentElement) {
const newCanvas = window.document.createElement("canvas"); const newCanvas = window.document.createElement("canvas");
const context = newCanvas.getContext("2d"); const context = newCanvas.getContext("2d");