better solution

Author: timon-schelling

desktop/src/app.rs

@@ -18,22 +18,22 @@ use crate::cef;
 use crate::consts::CEF_MESSAGE_LOOP_MAX_ITERATIONS;
 use crate::event::{AppEvent, AppEventScheduler};
 use crate::persist::PersistentData;
-use crate::render::GraphicsState;
+use crate::render::{RenderError, RenderState};
 use crate::window::Window;
 use crate::wrapper::messages::{DesktopFrontendMessage, DesktopWrapperMessage, Platform};
 use crate::wrapper::{DesktopWrapper, NodeGraphExecutionResult, WgpuContext, serialize_frontend_messages};
 
 pub(crate) struct App {
-	cef_context: Box<dyn cef::CefContext>,
+	render_state: Option<RenderState>,
+	wgpu_context: WgpuContext,
 	window: Option<Window>,
 	window_scale: f64,
-	cef_schedule: Option<Instant>,
-	cef_view_info_sender: Sender<cef::ViewInfoUpdate>,
-	graphics_state: Option<GraphicsState>,
-	wgpu_context: WgpuContext,
 	app_event_receiver: Receiver<AppEvent>,
 	app_event_scheduler: AppEventScheduler,
 	desktop_wrapper: DesktopWrapper,
+	cef_context: Box<dyn cef::CefContext>,
+	cef_schedule: Option<Instant>,
+	cef_view_info_sender: Sender<cef::ViewInfoUpdate>,
 	last_ui_update: Instant,
 	avg_frame_time: f32,
 	start_render_sender: SyncSender<()>,
@@ -77,17 +77,17 @@ impl App {
 		persistent_data.load_from_disk();
 
 		Self {
-			cef_context,
-			window: None,
-			window_scale: 1.0,
-			cef_schedule: Some(Instant::now()),
-			graphics_state: None,
-			cef_view_info_sender,
+			render_state: None,
 			wgpu_context,
+			window: None,
+			window_scale: 1.,
 			app_event_receiver,
 			app_event_scheduler,
 			desktop_wrapper: DesktopWrapper::new(),
 			last_ui_update: Instant::now(),
+			cef_context,
+			cef_schedule: Some(Instant::now()),
+			cef_view_info_sender,
 			avg_frame_time: 0.,
 			start_render_sender,
 			web_communication_initialized: false,
@@ -97,6 +97,17 @@ impl App {
 		}
 	}
 
+	fn resize_window(&mut self, width: u32, height: u32) {
+		let _ = self.cef_view_info_sender.send(cef::ViewInfoUpdate::Size { width, height });
+		self.cef_context.notify_view_info_changed();
+		if let Some(render_state) = &mut self.render_state {
+			render_state.resize(width, height);
+		}
+		if let Some(window) = &self.window {
+			window.request_redraw();
+		}
+	}
+
 	fn handle_desktop_frontend_message(&mut self, message: DesktopFrontendMessage, responses: &mut Vec<DesktopWrapperMessage>) {
 		match message {
 			DesktopFrontendMessage::ToWeb(messages) => {
@@ -162,23 +173,23 @@ impl App {
 				});
 			}
 			DesktopFrontendMessage::UpdateViewportPhysicalBounds { x, y, width, height } => {
-				if let Some(graphics_state) = &mut self.graphics_state
+				if let Some(render_state) = &mut self.render_state
 					&& let Some(window) = &self.window
 				{
 					let window_size = window.surface_size();
 
 					let viewport_offset_x = x / window_size.width as f64;
 					let viewport_offset_y = y / window_size.height as f64;
-					graphics_state.set_viewport_offset([viewport_offset_x as f32, viewport_offset_y as f32]);
+					render_state.set_viewport_offset([viewport_offset_x as f32, viewport_offset_y as f32]);
 
 					let viewport_scale_x = if width != 0.0 { window_size.width as f64 / width } else { 1.0 };
 					let viewport_scale_y = if height != 0.0 { window_size.height as f64 / height } else { 1.0 };
-					graphics_state.set_viewport_scale([viewport_scale_x as f32, viewport_scale_y as f32]);
+					render_state.set_viewport_scale([viewport_scale_x as f32, viewport_scale_y as f32]);
 				}
 			}
 			DesktopFrontendMessage::UpdateOverlays(scene) => {
-				if let Some(graphics_state) = &mut self.graphics_state {
-					graphics_state.set_overlays_scene(scene);
+				if let Some(render_state) = &mut self.render_state {
+					render_state.set_overlays_scene(scene);
 				}
 			}
 			DesktopFrontendMessage::PersistenceWriteDocument { id, document } => {
@@ -331,42 +342,25 @@ impl App {
 				NodeGraphExecutionResult::HasRun(texture) => {
 					self.dispatch_desktop_wrapper_message(DesktopWrapperMessage::PollNodeGraphEvaluation);
 					if let Some(texture) = texture
-						&& let Some(graphics_state) = self.graphics_state.as_mut()
+						&& let Some(render_state) = self.render_state.as_mut()
 						&& let Some(window) = self.window.as_ref()
 					{
-						graphics_state.bind_viewport_texture(texture);
+						render_state.bind_viewport_texture(texture);
 						window.request_redraw();
 					}
 				}
 				NodeGraphExecutionResult::NotRun => {}
 			},
 			AppEvent::UiUpdate(texture) => {
-				let width = texture.width();
-				let height = texture.height();
-				if let Some(graphics_state) = self.graphics_state.as_mut() {
-					graphics_state.resize(width, height);
-					graphics_state.bind_ui_texture(texture);
+				if let Some(render_state) = self.render_state.as_mut() {
+					render_state.bind_ui_texture(texture);
 					let elapsed = self.last_ui_update.elapsed().as_secs_f32();
 					self.last_ui_update = Instant::now();
 					if elapsed < 0.5 {
 						self.avg_frame_time = (self.avg_frame_time * 3. + elapsed) / 4.;
 					}
 				}
 				if let Some(window) = &self.window {
-					// Workaround for missing resize events on mac
-					// TODO: Find a cleaner solution
-					#[cfg(target_os = "macos")]
-					{
-						let surface_size = window.surface_size();
-						if width != surface_size.width || height != surface_size.height {
-							let _ = self.cef_view_info_sender.send(cef::ViewInfoUpdate::Size {
-								width: surface_size.width as usize,
-								height: surface_size.height as usize,
-							});
-							self.cef_context.notify_view_info_changed();
-						}
-					}
-
 					window.request_redraw();
 				}
 			}
@@ -405,9 +399,8 @@ impl ApplicationHandler for App {
 
 		self.window = Some(window);
 
-		let graphics_state = GraphicsState::new(self.window.as_ref().unwrap(), self.wgpu_context.clone());
-
-		self.graphics_state = Some(graphics_state);
+		let render_state = RenderState::new(self.window.as_ref().unwrap(), self.wgpu_context.clone());
+		self.render_state = Some(render_state);
 
 		self.desktop_wrapper.init(self.wgpu_context.clone());
 
@@ -434,11 +427,8 @@ impl ApplicationHandler for App {
 				self.app_event_scheduler.schedule(AppEvent::CloseWindow);
 			}
 			WindowEvent::SurfaceResized(PhysicalSize { width, height }) => {
-				let _ = self.cef_view_info_sender.send(cef::ViewInfoUpdate::Size {
-					width: width as usize,
-					height: height as usize,
-				});
-				self.cef_context.notify_view_info_changed();
+				self.resize_window(width, height);
+
 				if let Some(window) = &self.window {
 					let maximized = window.is_maximized();
 					self.app_event_scheduler.schedule(AppEvent::DesktopWrapperMessage(DesktopWrapperMessage::UpdateMaximized { maximized }));
@@ -450,18 +440,21 @@ impl ApplicationHandler for App {
 				self.cef_context.notify_view_info_changed();
 			}
 			WindowEvent::RedrawRequested => {
-				let Some(ref mut graphics_state) = self.graphics_state else { return };
-				// Only rerender once we have a new UI texture to display
+				let Some(render_state) = &mut self.render_state else { return };
 				if let Some(window) = &self.window {
-					match graphics_state.render(window) {
+					match render_state.render(window) {
 						Ok(_) => {}
-						Err(wgpu::SurfaceError::Lost) => {
+						Err(RenderError::OutdatedUITextureError) => {
+							self.cef_context.notify_view_info_changed();
+						}
+						Err(RenderError::SurfaceError(wgpu::SurfaceError::Lost)) => {
 							tracing::warn!("lost surface");
 						}
-						Err(wgpu::SurfaceError::OutOfMemory) => {
+						Err(RenderError::SurfaceError(wgpu::SurfaceError::OutOfMemory)) => {
+							tracing::error!("GPU out of memory");
 							event_loop.exit();
 						}
-						Err(e) => tracing::error!("{:?}", e),
+						Err(RenderError::SurfaceError(e)) => tracing::error!("Render error: {:?}", e),
 					}
 					let _ = self.start_render_sender.try_send(());
 				}

desktop/src/cef.rs

@@ -55,8 +55,8 @@ pub(crate) trait CefEventHandler: Send + Sync + 'static {
 
 #[derive(Clone, Copy)]
 pub(crate) struct ViewInfo {
-	width: usize,
-	height: usize,
+	width: u32,
+	height: u32,
 	scale: f64,
 }
 impl ViewInfo {
@@ -78,10 +78,10 @@ impl ViewInfo {
 	pub(crate) fn zoom(&self) -> f64 {
 		self.scale.ln() / 1.2_f64.ln()
 	}
-	pub(crate) fn width(&self) -> usize {
+	pub(crate) fn width(&self) -> u32 {
 		self.width
 	}
-	pub(crate) fn height(&self) -> usize {
+	pub(crate) fn height(&self) -> u32 {
 		self.height
 	}
 }
@@ -92,7 +92,7 @@ impl Default for ViewInfo {
 }
 
 pub(crate) enum ViewInfoUpdate {
-	Size { width: usize, height: usize },
+	Size { width: u32, height: u32 },
 	Scale(f64),
 }
 

desktop/src/consts.rs

@@ -1,4 +1,5 @@
 pub(crate) const APP_NAME: &str = "Graphite";
+#[cfg(target_os = "linux")]
 pub(crate) const APP_ID: &str = "rs.graphite.Graphite";
 
 pub(crate) const APP_DIRECTORY_NAME: &str = "graphite";

desktop/src/render.rs

@@ -1,5 +1,5 @@
 mod frame_buffer_ref;
 pub(crate) use frame_buffer_ref::FrameBufferRef;
 
-mod graphics_state;
-pub(crate) use graphics_state::GraphicsState;
+mod state;
+pub(crate) use state::{RenderError, RenderState};

desktop/src/render/graphics_state.rs renamed to desktop/src/render/state.rs

@@ -4,7 +4,7 @@ use crate::wrapper::{Color, WgpuContext, WgpuExecutor};
 
 #[derive(derivative::Derivative)]
 #[derivative(Debug)]
-pub(crate) struct GraphicsState {
+pub(crate) struct RenderState {
 	surface: wgpu::Surface<'static>,
 	context: WgpuContext,
 	executor: WgpuExecutor,
@@ -22,7 +22,7 @@ pub(crate) struct GraphicsState {
 	overlays_scene: Option<vello::Scene>,
 }
 
-impl GraphicsState {
+impl RenderState {
 	pub(crate) fn new(window: &Window, context: WgpuContext) -> Self {
 		let size = window.surface_size();
 		let surface = window.create_surface(context.instance.clone());
@@ -230,12 +230,15 @@ impl GraphicsState {
 		self.bind_overlays_texture(texture);
 	}
 
-	pub(crate) fn render(&mut self, window: &Window) -> Result<(), wgpu::SurfaceError> {
+	pub(crate) fn render(&mut self, window: &Window) -> Result<(), RenderError> {
 		if let Some(scene) = self.overlays_scene.take() {
 			self.render_overlays(scene);
 		}
 
-		let output = self.surface.get_current_texture()?;
+		let output = self.surface.get_current_texture().map_err(|e| RenderError::SurfaceError(e))?;
+		let output_width = output.texture.width();
+		let output_height = output.texture.height();
+
 		let view = output.texture.create_view(&wgpu::TextureViewDescriptor::default());
 
 		let mut encoder = self.context.device.create_command_encoder(&wgpu::CommandEncoderDescriptor { label: Some("Render Encoder") });
@@ -277,6 +280,12 @@ impl GraphicsState {
 		window.pre_present_notify();
 		output.present();
 
+		if let Some(ui_texture) = &self.ui_texture
+			&& (output_width != ui_texture.width() || output_height != ui_texture.height())
+		{
+			return Err(RenderError::OutdatedUITextureError);
+		}
+
 		Ok(())
 	}
 
@@ -312,6 +321,11 @@ impl GraphicsState {
 	}
 }
 
+pub(crate) enum RenderError {
+	OutdatedUITextureError,
+	SurfaceError(wgpu::SurfaceError),
+}
+
 #[repr(C)]
 #[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
 struct Constants {

desktop/wrapper/src/utils.rs

@@ -3,7 +3,7 @@ pub(crate) mod menu {
 	use base64::engine::Engine;
 	use base64::engine::general_purpose::STANDARD as BASE64;
 
-	use graphite_editor::messages::input_mapper::utility_types::input_keyboard::{Key, LabeledKey, LabeledShortcut};
+	use graphite_editor::messages::input_mapper::utility_types::input_keyboard::{Key, LabeledKeyOrMouseMotion, LabeledShortcut};
 	use graphite_editor::messages::input_mapper::utility_types::misc::ActionShortcut;
 	use graphite_editor::messages::layout::LayoutMessage;
 	use graphite_editor::messages::tool::tool_messages::tool_prelude::{LayoutGroup, LayoutTarget, MenuListEntry, SubLayout, Widget, WidgetId};
@@ -68,9 +68,9 @@ pub(crate) mod menu {
 			value,
 			label,
 			icon,
-			shortcut_keys,
-			children,
 			disabled,
+			tooltip_shortcut,
+			children,
 			..
 		}: &MenuListEntry = entry;
 		path.push(value.clone());
@@ -83,7 +83,7 @@ pub(crate) mod menu {
 			return MenuItem::SubMenu { id, text, enabled, items };
 		}
 
-		let shortcut = match shortcut_keys {
+		let shortcut = match tooltip_shortcut {
 			Some(ActionShortcut::Shortcut(LabeledShortcut(shortcut))) => convert_labeled_keys_to_shortcut(shortcut),
 			_ => None,
 		};
@@ -126,10 +126,14 @@ pub(crate) mod menu {
 		items
 	}
 
-	fn convert_labeled_keys_to_shortcut(labeled_keys: &Vec<LabeledKey>) -> Option<Shortcut> {
+	fn convert_labeled_keys_to_shortcut(labeled_keys: &Vec<LabeledKeyOrMouseMotion>) -> Option<Shortcut> {
 		let mut key: Option<KeyCode> = None;
 		let mut modifiers = Modifiers::default();
 		for labeled_key in labeled_keys {
+			let LabeledKeyOrMouseMotion::Key(labeled_key) = labeled_key else {
+				// Return None for shortcuts that include mouse motion because we can't show them in native menu
+				return None;
+			};
 			match labeled_key.key() {
 				Key::Shift => modifiers |= Modifiers::SHIFT,
 				Key::Control => modifiers |= Modifiers::CONTROL,