Desktop: Fix window maximize and minimize (#3200)

Fix window maximize and minimize state

desktop/src/app.rs

@@ -166,10 +166,15 @@ impl App {
 					graphics_state.set_overlays_scene(scene);
 				}
 			}
-			DesktopFrontendMessage::UpdateWindowState { maximized, minimized } => {
+			DesktopFrontendMessage::MinimizeWindow => {
 				if let Some(window) = &self.window {
+					window.set_minimized(true);
+				}
+			}
+			DesktopFrontendMessage::MaximizeWindow => {
+				if let Some(window) = &self.window {
+					let maximized = !window.is_maximized();
 					window.set_maximized(maximized);
-					window.set_minimized(minimized);
 				}
 			}
 			DesktopFrontendMessage::DragWindow => {
@@ -352,6 +357,10 @@ impl ApplicationHandler for App {
 			WindowEvent::SurfaceResized(size) => {
 				let _ = self.cef_window_size_sender.send(size.into());
 				self.cef_context.notify_of_resize();
+				if let Some(window) = &self.window {
+					let maximized = window.is_maximized();
+					self.app_event_scheduler.schedule(AppEvent::DesktopWrapperMessage(DesktopWrapperMessage::UpdateMaximized { maximized }));
+				}
 			}
 			WindowEvent::RedrawRequested => {
 				let Some(ref mut graphics_state) = self.graphics_state else { return };

desktop/wrapper/src/handle_desktop_wrapper_message.rs

@@ -1,7 +1,7 @@
 use graphene_std::Color;
 use graphene_std::raster::Image;
 use graphite_editor::messages::app_window::app_window_message_handler::AppWindowPlatform;
-use graphite_editor::messages::prelude::{AppWindowMessage, DocumentMessage, PortfolioMessage, PreferencesMessage};
+use graphite_editor::messages::prelude::{AppWindowMessage, DocumentMessage, FrontendMessage, PortfolioMessage, PreferencesMessage};
 
 use crate::messages::Platform;
 
@@ -118,6 +118,10 @@ pub(super) fn handle_desktop_wrapper_message(dispatcher: &mut DesktopWrapperMess
 			let message = AppWindowMessage::AppWindowUpdatePlatform { platform };
 			dispatcher.queue_editor_message(message.into());
 		}
+		DesktopWrapperMessage::UpdateMaximized { maximized } => {
+			let message = FrontendMessage::UpdateMaximized { maximized };
+			dispatcher.queue_editor_message(message.into());
+		}
 		DesktopWrapperMessage::LoadDocument {
 			id,
 			document,

desktop/wrapper/src/intercept_frontend_message.rs

@@ -64,18 +64,18 @@ pub(super) fn intercept_frontend_message(dispatcher: &mut DesktopWrapperMessageD
 		FrontendMessage::TriggerVisitLink { url } => {
 			dispatcher.respond(DesktopFrontendMessage::OpenUrl(url));
 		}
-		FrontendMessage::UpdateWindowState { maximized, minimized } => {
-			dispatcher.respond(DesktopFrontendMessage::UpdateWindowState { maximized, minimized });
-
-			// Forward this to update the UI
-			return Some(message);
-		}
 		FrontendMessage::DragWindow => {
 			dispatcher.respond(DesktopFrontendMessage::DragWindow);
 		}
 		FrontendMessage::CloseWindow => {
 			dispatcher.respond(DesktopFrontendMessage::CloseWindow);
 		}
+		FrontendMessage::TriggerMinimizeWindow => {
+			dispatcher.respond(DesktopFrontendMessage::MinimizeWindow);
+		}
+		FrontendMessage::TriggerMaximizeWindow => {
+			dispatcher.respond(DesktopFrontendMessage::MaximizeWindow);
+		}
 		FrontendMessage::TriggerPersistenceWriteDocument { document_id, document, details } => {
 			dispatcher.respond(DesktopFrontendMessage::PersistenceWriteDocument {
 				id: document_id,

desktop/wrapper/src/messages.rs

@@ -32,10 +32,8 @@ pub enum DesktopFrontendMessage {
 		height: f32,
 	},
 	UpdateOverlays(vello::Scene),
-	UpdateWindowState {
-		maximized: bool,
-		minimized: bool,
-	},
+	MinimizeWindow,
+	MaximizeWindow,
 	DragWindow,
 	CloseWindow,
 	PersistenceWriteDocument {
@@ -92,6 +90,9 @@ pub enum DesktopWrapperMessage {
 	},
 	PollNodeGraphEvaluation,
 	UpdatePlatform(Platform),
+	UpdateMaximized {
+		maximized: bool,
+	},
 	LoadDocument {
 		id: DocumentId,
 		document: Document,