Merge branch 'master' into fix/joining-paths-same-pointids

Author: Ayush2k02

desktop/Cargo.toml

@@ -55,6 +55,7 @@ windows = { version = "0.58.0", features = [
 	"Win32_Graphics_Gdi",
 	"Win32_System_LibraryLoader",
 	"Win32_System_Com",
+	"Win32_System_Console",
 	"Win32_UI_Controls",
 	"Win32_UI_WindowsAndMessaging",
 	"Win32_UI_HiDpi",

desktop/src/lib.rs

@@ -93,6 +93,14 @@ pub fn start() {
 	let mut app = App::new(Box::new(cef_context), cef_view_info_sender, wgpu_context, app_event_receiver, app_event_scheduler, cli.files);
 
 	event_loop.run_app(&mut app).unwrap();
+
+	// Workaround for a Windows-specific exception that occurs when `app` is dropped.
+	// The issue causes the window to hang for a few seconds before closing.
+	// Appears to be related to CEF object destruction order.
+	// Calling `exit` bypasses rust teardown and lets Windows perform process cleanup.
+	// TODO: Identify and fix the underlying CEF shutdown issue so this workaround can be removed.
+	#[cfg(target_os = "windows")]
+	exit(0);
 }
 
 pub fn start_helper() {

desktop/src/window.rs

@@ -41,7 +41,13 @@ pub(crate) struct Window {
 	#[allow(dead_code)]
 	native_handle: native::NativeWindowImpl,
 	custom_cursors: HashMap<CustomCursorSource, CustomCursor>,
-	clipboard: window_clipboard::Clipboard,
+	clipboard: Option<window_clipboard::Clipboard>,
+}
+impl Drop for Window {
+	fn drop(&mut self) {
+		// Clipboard must be dropped before `winit_window`
+		drop(self.clipboard.take());
+	}
 }
 
 impl Window {
@@ -62,7 +68,7 @@ impl Window {
 
 		let winit_window = event_loop.create_window(attributes).unwrap();
 		let native_handle = native::NativeWindowImpl::new(winit_window.as_ref(), app_event_scheduler);
-		let clipboard = unsafe { window_clipboard::Clipboard::connect(&winit_window) }.expect("failed to create clipboard");
+		let clipboard = unsafe { window_clipboard::Clipboard::connect(&winit_window) }.ok();
 		Self {
 			winit_window: winit_window.into(),
 			native_handle,
@@ -158,7 +164,11 @@ impl Window {
 	}
 
 	pub(crate) fn clipboard_read(&self) -> Option<String> {
-		match self.clipboard.read() {
+		let Some(clipboard) = &self.clipboard else {
+			tracing::error!("Clipboard not available");
+			return None;
+		};
+		match clipboard.read() {
 			Ok(data) => Some(data),
 			Err(e) => {
 				tracing::error!("Failed to read from clipboard: {e}");
@@ -168,7 +178,11 @@ impl Window {
 	}
 
 	pub(crate) fn clipboard_write(&mut self, data: String) {
-		if let Err(e) = self.clipboard.write(data) {
+		let Some(clipboard) = &mut self.clipboard else {
+			tracing::error!("Clipboard not available");
+			return;
+		};
+		if let Err(e) = clipboard.write(data) {
 			tracing::error!("Failed to write to clipboard: {e}")
 		}
 	}

desktop/src/window/win.rs

@@ -1,4 +1,5 @@
 use windows::Win32::System::Com::{COINIT_APARTMENTTHREADED, CoInitializeEx};
+use windows::Win32::System::Console::{ATTACH_PARENT_PROCESS, AttachConsole};
 use windows::Win32::UI::Shell::SetCurrentProcessExplicitAppUserModelID;
 use windows::core::HSTRING;
 use winit::event_loop::ActiveEventLoop;
@@ -13,6 +14,12 @@ pub(super) struct NativeWindowImpl {
 
 impl super::NativeWindow for NativeWindowImpl {
 	fn init() {
+		// Attach to parent console if launched from a terminal (no-op otherwise)
+		unsafe {
+			let _ = AttachConsole(ATTACH_PARENT_PROCESS);
+		}
+
+		// Set stable app ID
 		let app_id = HSTRING::from(APP_ID);
 		unsafe {
 			let _ = CoInitializeEx(None, COINIT_APARTMENTTHREADED).ok();

desktop/src/window/win/native_handle.rs

@@ -61,7 +61,7 @@ impl NativeWindowHandle {
 				0,
 				0,
 				0,
-				None,
+				main,
 				None,
 				HINSTANCE(std::ptr::null_mut()),
 				// Pass the main window's HWND to WM_NCCREATE so the helper can store it.
@@ -118,7 +118,7 @@ impl NativeWindowHandle {
 		}
 
 		// Force window update
-		let _ = unsafe { SetWindowPos(main, None, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER) };
+		let _ = unsafe { SetWindowPos(main, None, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE) };
 
 		native_handle
 	}
@@ -325,20 +325,20 @@ unsafe fn position_helper(main: HWND, helper: HWND) {
 	let w = (r.right - r.left) + RESIZE_BAND_THICKNESS * 2;
 	let h = (r.bottom - r.top) + RESIZE_BAND_THICKNESS * 2;
 
-	let _ = unsafe { SetWindowPos(helper, main, x, y, w, h, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING) };
+	let _ = unsafe { SetWindowPos(helper, main, x, y, w, h, SWP_NOACTIVATE | SWP_NOSENDCHANGING) };
 }
 
 unsafe fn calculate_hit(helper: HWND, lparam: LPARAM) -> u32 {
-	let x = (lparam.0 & 0xFFFF) as i16 as u32;
-	let y = ((lparam.0 >> 16) & 0xFFFF) as i16 as u32;
+	let x = (lparam.0 & 0xFFFF) as i16 as i32;
+	let y = ((lparam.0 >> 16) & 0xFFFF) as i16 as i32;
 
 	let mut r = RECT::default();
 	let _ = unsafe { GetWindowRect(helper, &mut r) };
 
-	let on_top = y < (r.top + RESIZE_BAND_THICKNESS) as u32;
-	let on_right = x >= (r.right - RESIZE_BAND_THICKNESS) as u32;
-	let on_bottom = y >= (r.bottom - RESIZE_BAND_THICKNESS) as u32;
-	let on_left = x < (r.left + RESIZE_BAND_THICKNESS) as u32;
+	let on_top = y < (r.top + RESIZE_BAND_THICKNESS) as i32;
+	let on_right = x >= (r.right - RESIZE_BAND_THICKNESS) as i32;
+	let on_bottom = y >= (r.bottom - RESIZE_BAND_THICKNESS) as i32;
+	let on_left = x < (r.left + RESIZE_BAND_THICKNESS) as i32;
 
 	match (on_top, on_right, on_bottom, on_left) {
 		(true, _, _, true) => HTTOPLEFT,

node-graph/graph-craft/src/document/value.rs

@@ -189,19 +189,19 @@ tagged_value! {
 	// TABLE TYPES
 	// ===========
 	GraphicUnused(Graphic), // TODO: This is unused but removing it causes `cargo test` to infinitely recurse its type solving; figure out why and then remove this
-	#[cfg_attr(target_family = "wasm", serde(deserialize_with = "graphic_types::migrations::migrate_vector"))] // TODO: Eventually remove this migration document upgrade code
+	#[serde(deserialize_with = "graphic_types::migrations::migrate_vector")] // TODO: Eventually remove this migration document upgrade code
 	#[serde(alias = "VectorData")]
 	Vector(Table<Vector>),
-	#[cfg_attr(target_family = "wasm", serde(deserialize_with = "graphic_types::raster_types::image::migrate_image_frame"))] // TODO: Eventually remove this migration document upgrade code
+	#[serde(deserialize_with = "graphic_types::raster_types::image::migrate_image_frame")] // TODO: Eventually remove this migration document upgrade code
 	#[serde(alias = "ImageFrame", alias = "RasterData", alias = "Image")]
 	Raster(Table<Raster<CPU>>),
-	#[cfg_attr(target_family = "wasm", serde(deserialize_with = "graphic_types::graphic::migrate_graphic"))] // TODO: Eventually remove this migration document upgrade code
+	#[serde(deserialize_with = "graphic_types::graphic::migrate_graphic")] // TODO: Eventually remove this migration document upgrade code
 	#[serde(alias = "GraphicGroup", alias = "Group")]
 	Graphic(Table<Graphic>),
-	#[cfg_attr(target_family = "wasm", serde(deserialize_with = "graphic_types::artboard::migrate_artboard"))] // TODO: Eventually remove this migration document upgrade code
+	#[serde(deserialize_with = "graphic_types::artboard::migrate_artboard")] // TODO: Eventually remove this migration document upgrade code
 	#[serde(alias = "ArtboardGroup")]
 	Artboard(Table<Artboard>),
-	#[cfg_attr(target_family = "wasm", serde(deserialize_with = "core_types::misc::migrate_color"))] // TODO: Eventually remove this migration document upgrade code
+	#[serde(deserialize_with = "core_types::misc::migrate_color")] // TODO: Eventually remove this migration document upgrade code
 	#[serde(alias = "ColorTable", alias = "OptionalColor")]
 	Color(Table<Color>),
 	GradientTable(Table<GradientStops>),