mirror of
https://github.com/GraphiteEditor/Graphite.git
synced 2026-09-25 03:38:11 +08:00
Fix eyedropped not working on raster data when canvas is used
This commit is contained in:
@@ -127,6 +127,9 @@ pub struct DocumentMessageHandler {
|
||||
/// Whether or not the editor has executed the network to render the document yet. If this is opened as an inactive tab, it won't be loaded initially because the active tab is prioritized.
|
||||
#[serde(skip)]
|
||||
pub is_loaded: bool,
|
||||
/// Whether or not if rendering image data via the canvas should be disabled forcefully. Currently it only checks for eyedropper.
|
||||
#[serde(skip)]
|
||||
pub disable_canvas_override: bool,
|
||||
}
|
||||
|
||||
impl Default for DocumentMessageHandler {
|
||||
@@ -165,6 +168,7 @@ impl Default for DocumentMessageHandler {
|
||||
auto_saved_hash: None,
|
||||
layer_range_selection_reference: None,
|
||||
is_loaded: false,
|
||||
disable_canvas_override: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -182,6 +186,8 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
|
||||
device_pixel_ratio,
|
||||
} = context;
|
||||
|
||||
self.disable_canvas_override = *current_tool == ToolType::Eyedropper;
|
||||
|
||||
match message {
|
||||
// Sub-messages
|
||||
DocumentMessage::Navigation(message) => {
|
||||
|
||||
@@ -136,6 +136,7 @@ impl NodeGraphExecutor {
|
||||
|
||||
/// Adds an evaluate request for whatever current network is cached.
|
||||
pub(crate) fn submit_current_node_graph_evaluation(&mut self, document: &mut DocumentMessageHandler, viewport_resolution: UVec2, time: TimingInformation) -> Result<(), String> {
|
||||
let disable_canvas_override = document.disable_canvas_override;
|
||||
let render_config = RenderConfig {
|
||||
viewport: Footprint {
|
||||
transform: document.metadata().document_to_viewport,
|
||||
@@ -150,6 +151,7 @@ impl NodeGraphExecutor {
|
||||
view_mode: document.view_mode,
|
||||
hide_artboards: false,
|
||||
for_export: false,
|
||||
disable_canvas_override,
|
||||
};
|
||||
|
||||
// Execute the node graph
|
||||
@@ -200,6 +202,7 @@ impl NodeGraphExecutor {
|
||||
view_mode: document.view_mode,
|
||||
hide_artboards: export_config.transparent_background,
|
||||
for_export: true,
|
||||
disable_canvas_override: false,
|
||||
};
|
||||
export_config.size = size;
|
||||
|
||||
@@ -336,6 +339,7 @@ impl NodeGraphExecutor {
|
||||
for_export: false,
|
||||
for_mask: false,
|
||||
alignment_parent_transform: None,
|
||||
disable_canvas_override: false
|
||||
};
|
||||
|
||||
// Render SVG
|
||||
|
||||
@@ -362,6 +362,7 @@ impl NodeRuntime {
|
||||
hide_artboards: false,
|
||||
for_export: false,
|
||||
for_mask: false,
|
||||
disable_canvas_override: false,
|
||||
alignment_parent_transform: None,
|
||||
};
|
||||
let mut render = SvgRender::new();
|
||||
|
||||
Reference in New Issue
Block a user