Desktop: Window resize handling on Windows (#3167)

* Native window resize on windows

* Fix linux build

* Fix windows build

* try clean up

* clean up

* Add module comment

* FIx

* Review improvements

* Improve

Author: timon-schelling

desktop/Cargo.toml

@@ -41,20 +41,25 @@ vello = { workspace = true }
 derivative = { workspace = true }
 rfd = { workspace = true }
 open = { workspace = true }
-rand = { workspace = true }
+rand = { workspace = true, features = ["thread_rng"] }
 serde = { workspace = true }
 
 # Hardware acceleration dependencies
 ash = { version = "0.38", optional = true }
 
 # Windows-specific dependencies
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.58", features = [
+windows = { version = "0.58.0", features = [
+	"Win32_Foundation",
 	"Win32_Graphics_Direct3D11",
 	"Win32_Graphics_Direct3D12",
 	"Win32_Graphics_Dxgi",
 	"Win32_Graphics_Dxgi_Common",
-	"Win32_Foundation"
+	"Win32_Graphics_Dwm",
+	"Win32_Graphics_Gdi",
+	"Win32_System_LibraryLoader",
+	"Win32_UI_Controls",
+	"Win32_UI_WindowsAndMessaging",
 ], optional = true }
 
 # macOS-specific dependencies

desktop/src/app.rs

@@ -23,10 +23,12 @@ use winit::window::Window;
 use winit::window::WindowId;
 
 use crate::cef;
+use crate::native_window;
 
 pub(crate) struct WinitApp {
 	cef_context: Box<dyn cef::CefContext>,
 	window: Option<Arc<Window>>,
+	native_window: native_window::NativeWindowHandle,
 	cef_schedule: Option<Instant>,
 	window_size_sender: Sender<WindowSize>,
 	graphics_state: Option<GraphicsState>,
@@ -71,6 +73,7 @@ impl WinitApp {
 			web_communication_initialized: false,
 			web_communication_startup_buffer: Vec::new(),
 			persistent_data,
+			native_window: Default::default(),
 		}
 	}
 
@@ -277,22 +280,15 @@ impl ApplicationHandler<CustomEvent> for WinitApp {
 			.with_title(APP_NAME)
 			.with_min_inner_size(winit::dpi::LogicalSize::new(400, 300))
 			.with_inner_size(winit::dpi::LogicalSize::new(1200, 800))
-			.with_decorations(false)
 			.with_resizable(true);
 
-		#[cfg(target_os = "linux")]
-		{
-			use crate::consts::APP_ID;
-			use winit::platform::wayland::ActiveEventLoopExtWayland;
+		window = self.native_window.build(window, event_loop);
 
-			window = if event_loop.is_wayland() {
-				winit::platform::wayland::WindowAttributesExtWayland::with_name(window, APP_ID, "")
-			} else {
-				winit::platform::x11::WindowAttributesExtX11::with_name(window, APP_ID, APP_NAME)
-			}
-		}
+		let window = event_loop.create_window(window).unwrap();
+
+		self.native_window.setup(&window);
 
-		let window = Arc::new(event_loop.create_window(window).unwrap());
+		let window = Arc::new(window);
 		let graphics_state = GraphicsState::new(window.clone(), self.wgpu_context.clone());
 
 		self.window = Some(window);

desktop/src/cef/texture_import/d3d11.rs

@@ -265,7 +265,6 @@ impl D3D11Importer {
 
 	fn import_d3d11_handle_to_d3d12(&self, hal_device: &<wgpu::hal::api::Dx12 as wgpu::hal::Api>::Device) -> Result<windows::Win32::Graphics::Direct3D12::ID3D12Resource, TextureImportError> {
 		use windows::Win32::Graphics::Direct3D12::*;
-		use windows::core::*;
 
 		// Get D3D12 device from wgpu-hal
 		let d3d12_device = hal_device.raw_device();

desktop/src/main.rs

@@ -9,6 +9,8 @@ pub(crate) mod consts;
 
 mod cef;
 
+mod native_window;
+
 mod render;
 
 mod app;

desktop/src/native_window.rs

@@ -0,0 +1,44 @@
+use winit::event_loop::ActiveEventLoop;
+use winit::window::{Window, WindowAttributes};
+
+#[cfg(target_os = "windows")]
+mod windows;
+
+pub(crate) enum NativeWindowHandle {
+	#[cfg(target_os = "windows")]
+	#[expect(private_interfaces, dead_code)]
+	Windows(windows::WindowsNativeWindowHandle),
+	None,
+}
+impl Default for NativeWindowHandle {
+	fn default() -> Self {
+		Self::None
+	}
+}
+impl NativeWindowHandle {
+	#[allow(unused_variables)]
+	pub(super) fn build(&mut self, window: WindowAttributes, event_loop: &ActiveEventLoop) -> WindowAttributes {
+		#[cfg(target_os = "linux")]
+		{
+			use crate::consts::{APP_ID, APP_NAME};
+			use winit::platform::wayland::ActiveEventLoopExtWayland;
+			if event_loop.is_wayland() {
+				winit::platform::wayland::WindowAttributesExtWayland::with_name(window, APP_ID, "")
+			} else {
+				winit::platform::x11::WindowAttributesExtX11::with_name(window, APP_ID, APP_NAME)
+			}
+		}
+		#[cfg(not(target_os = "linux"))]
+		{
+			window
+		}
+	}
+
+	#[allow(unused_variables)]
+	pub(crate) fn setup(&mut self, window: &Window) {
+		#[cfg(target_os = "windows")]
+		{
+			*self = NativeWindowHandle::Windows(windows::WindowsNativeWindowHandle::new(window));
+		}
+	}
+}