mostly done

Author: timon-schelling

editor/src/messages/frontend/frontend_message.rs

@@ -1,5 +1,6 @@
 use super::utility_types::{DocumentDetails, MouseCursorIcon, OpenDocument};
 use crate::messages::app_window::app_window_message_handler::AppWindowPlatform;
+use crate::messages::frontend::utility_types::EyedropperPreviewImage;
 use crate::messages::input_mapper::utility_types::misc::ActionShortcut;
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::node_graph::utility_types::{
@@ -253,6 +254,7 @@ pub enum FrontendMessage {
 		multiplier: (f64, f64),
 	},
 	UpdateEyedropperSamplingState {
+		image: Option<EyedropperPreviewImage>,
 		#[serde(rename = "mousePosition")]
 		mouse_position: Option<(f64, f64)>,
 		#[serde(rename = "primaryColor")]

editor/src/messages/frontend/utility_types.rs

@@ -62,3 +62,10 @@ pub enum ExportBounds {
 	Selection,
 	Artboard(LayerNodeIdentifier),
 }
+
+#[derive(Clone, Debug, Default, Eq, PartialEq, serde::Serialize, serde::Deserialize, specta::Type)]
+pub struct EyedropperPreviewImage {
+	pub data: Vec<u8>,
+	pub width: u32,
+	pub height: u32,
+}

editor/src/messages/portfolio/portfolio_message.rs

@@ -148,6 +148,7 @@ pub enum PortfolioMessage {
 		document_id: DocumentId,
 		ignore_hash: bool,
 	},
+	SubmitEyedropperPreviewRender,
 	ToggleResetNodesToDefinitionsOnOpen,
 	ToggleFocusDocument,
 	ToggleDataPanelOpen,

editor/src/messages/portfolio/portfolio_message_handler.rs

@@ -25,7 +25,7 @@ use crate::messages::tool::utility_types::{HintData, ToolType};
 use crate::messages::viewport::ToPhysical;
 use crate::node_graph_executor::{ExportConfig, NodeGraphExecutor};
 use derivative::*;
-use glam::{DAffine2, DVec2};
+use glam::{DAffine2, DVec2, UVec2};
 use graph_craft::document::NodeId;
 use graphene_std::Color;
 use graphene_std::raster_types::Image;
@@ -1178,6 +1178,38 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageContext<'_>> for Portfolio
 					Ok(message) => responses.add_front(message),
 				}
 			}
+			#[cfg(not(target_family = "wasm"))]
+			PortfolioMessage::SubmitEyedropperPreviewRender => {
+				let Some(document_id) = self.active_document_id else {
+					return;
+				};
+				let Some(document) = self.documents.get_mut(&document_id) else {
+					return;
+				};
+
+				let document_to_viewport = document
+					.navigation_handler
+					.calculate_offset_transform(viewport.center_in_viewport_space().into(), &document.document_ptz);
+				let pointer_position = document_to_viewport.inverse().transform_point2(ipp.mouse.position);
+
+				let resolution = UVec2::splat(11);
+
+				let result = self.executor.submit_eyedropper_preview(document_id, resolution, timing_information, pointer_position);
+
+				match result {
+					Err(description) => {
+						responses.add(DialogMessage::DisplayDialogError {
+							title: "Unable to update node graph".to_string(),
+							description,
+						});
+					}
+					Ok(message) => responses.add_front(message),
+				}
+			}
+			#[cfg(target_family = "wasm")]
+			PortfolioMessage::SubmitEyedropperPreviewRender => {
+				// For wasm this is implemented through svg rendering
+			}
 			PortfolioMessage::ToggleFocusDocument => {
 				self.focus_document = !self.focus_document;
 				responses.add(MenuBarMessage::SendLayout);

editor/src/messages/tool/tool_messages/eyedropper_tool.rs

@@ -1,5 +1,5 @@
 use super::tool_prelude::*;
-use crate::messages::tool::utility_types::DocumentToolData;
+use crate::messages::{frontend::utility_types::EyedropperPreviewImage, tool::utility_types::DocumentToolData};
 
 #[derive(Default, ExtractField)]
 pub struct EyedropperTool {
@@ -19,6 +19,8 @@ pub enum EyedropperToolMessage {
 	PointerMove,
 	SampleSecondaryColorBegin,
 	SampleSecondaryColorEnd,
+
+	PreviewImage { data: Vec<u8>, width: u32, height: u32 },
 }
 
 impl ToolMetadata for EyedropperTool {
@@ -42,6 +44,17 @@ impl LayoutHolder for EyedropperTool {
 #[message_handler_data]
 impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for EyedropperTool {
 	fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque<Message>, context: &mut ToolActionMessageContext<'a>) {
+		if let ToolMessage::Eyedropper(EyedropperToolMessage::PreviewImage { data, width, height }) = message {
+			responses.add(FrontendMessage::UpdateEyedropperSamplingState {
+				image: Some(EyedropperPreviewImage { data, width, height }),
+				mouse_position: Some(context.input.mouse.position.into()),
+				primary_color: "#".to_string() + context.global_tool_data.primary_color.to_rgb_hex_srgb().as_str(),
+				secondary_color: "#".to_string() + context.global_tool_data.secondary_color.to_rgb_hex_srgb().as_str(),
+				set_color_choice: Some("Primary".to_string()),
+			});
+			return;
+		}
+
 		self.fsm_state.process_event(message, &mut self.data, context, &(), responses, true);
 	}
 
@@ -153,6 +166,7 @@ impl Fsm for EyedropperToolFsmState {
 
 fn disable_cursor_preview(responses: &mut VecDeque<Message>) {
 	responses.add(FrontendMessage::UpdateEyedropperSamplingState {
+		image: None,
 		mouse_position: None,
 		primary_color: "".into(),
 		secondary_color: "".into(),
@@ -161,10 +175,16 @@ fn disable_cursor_preview(responses: &mut VecDeque<Message>) {
 }
 
 fn update_cursor_preview(responses: &mut VecDeque<Message>, input: &InputPreprocessorMessageHandler, global_tool_data: &DocumentToolData, set_color_choice: Option<String>) {
+	#[cfg(target_family = "wasm")]
 	responses.add(FrontendMessage::UpdateEyedropperSamplingState {
+		image: None,
 		mouse_position: Some(input.mouse.position.into()),
 		primary_color: "#".to_string() + global_tool_data.primary_color.to_rgb_hex_srgb().as_str(),
 		secondary_color: "#".to_string() + global_tool_data.secondary_color.to_rgb_hex_srgb().as_str(),
 		set_color_choice,
 	});
+	#[cfg(not(target_family = "wasm"))]
+	{
+		responses.add(PortfolioMessage::SubmitEyedropperPreviewRender);
+	}
 }