move NSApplication init to window code

Author: timon-schelling

desktop/src/app.rs

@@ -44,6 +44,10 @@ pub(crate) struct App {
 }
 
 impl App {
+	pub(crate) fn init() {
+		Window::init();
+	}
+
 	pub(crate) fn new(
 		cef_context: Box<dyn cef::CefContext>,
 		cef_view_info_sender: Sender<cef::ViewInfoUpdate>,

desktop/src/lib.rs

@@ -23,42 +23,9 @@ use cef::CefHandler;
 use cli::Cli;
 use event::CreateAppEventSchedulerEventLoopExt;
 
-mod mac_app_impl {
-	use objc2::{ClassType, define_class, msg_send};
-	use objc2_app_kit::{NSApplication, NSEvent, NSEventType, NSResponder};
-	use objc2_foundation::NSObject;
-
-	define_class!(
-		#[unsafe(super(NSApplication, NSResponder, NSObject))]
-		#[name = "GraphiteApplication"]
-		pub(super) struct GraphiteApplication;
-
-		impl GraphiteApplication {
-			#[unsafe(method(sendEvent:))]
-			fn send_event(&self, event: &NSEvent) {
-				if event.r#type() == NSEventType::KeyDown && let Some(key_window) = self.keyWindow() {
-					unsafe { msg_send![&key_window, sendEvent: event] }
-				} else {
-					unsafe { msg_send![super(self), sendEvent: event] }
-				}
-			}
-		}
-	);
-
-	impl GraphiteApplication {
-		pub(super) fn init() {
-			unsafe {
-				let _: &NSApplication = msg_send![GraphiteApplication::class(), sharedApplication];
-			}
-		}
-	}
-}
-
 pub fn start() {
 	tracing_subscriber::fmt().with_env_filter(EnvFilter::from_default_env()).init();
 
-	mac_app_impl::GraphiteApplication::init();
-
 	let cef_context_builder = cef::CefContextBuilder::<CefHandler>::new();
 
 	if cef_context_builder.is_sub_process() {
@@ -69,6 +36,8 @@ pub fn start() {
 		return;
 	}
 
+	App::init();
+
 	let cli = Cli::parse();
 
 	let wgpu_context = futures::executor::block_on(gpu_context::create_wgpu_context());

desktop/src/window.rs

@@ -4,9 +4,11 @@ use winit::window::{Window as WinitWindow, WindowAttributes};
 
 use crate::consts::APP_NAME;
 use crate::event::AppEventScheduler;
+use crate::window::mac::NativeWindowImpl;
 use crate::wrapper::messages::MenuItem;
 
 pub(crate) trait NativeWindow {
+	fn init();
 	fn configure(attributes: WindowAttributes, event_loop: &dyn ActiveEventLoop) -> WindowAttributes;
 	fn new(window: &dyn WinitWindow, app_event_scheduler: AppEventScheduler) -> Self;
 	fn update_menu(&self, _entries: Vec<MenuItem>) {}
@@ -34,6 +36,10 @@ pub(crate) struct Window {
 }
 
 impl Window {
+	pub(crate) fn init() {
+		NativeWindowImpl::init();
+	}
+
 	pub(crate) fn new(event_loop: &dyn ActiveEventLoop, app_event_scheduler: AppEventScheduler) -> Self {
 		let mut attributes = WindowAttributes::default()
 			.with_title(APP_NAME)

desktop/src/window/mac.rs

@@ -5,11 +5,18 @@ use winit::window::{Window, WindowAttributes};
 use crate::event::AppEventScheduler;
 use crate::wrapper::messages::MenuItem;
 
+mod app;
+mod menu;
+
 pub(super) struct NativeWindowImpl {
 	menu: menu::Menu,
 }
 
 impl super::NativeWindow for NativeWindowImpl {
+	fn init() {
+		app::init();
+	}
+
 	fn configure(attributes: WindowAttributes, _event_loop: &dyn ActiveEventLoop) -> WindowAttributes {
 		let mac_window = WindowAttributesMacOS::default()
 			.with_titlebar_transparent(true)
@@ -28,5 +35,3 @@ impl super::NativeWindow for NativeWindowImpl {
 		self.menu.update(entries);
 	}
 }
-
-mod menu;

desktop/src/window/mac/app.rs

@@ -0,0 +1,27 @@
+use objc2::{ClassType, define_class, msg_send};
+use objc2_app_kit::{NSApplication, NSEvent, NSEventType, NSResponder};
+use objc2_foundation::NSObject;
+
+pub(super) fn init() {
+	unsafe {
+		let _: &NSApplication = msg_send![GraphiteApplication::class(), sharedApplication];
+	}
+}
+
+define_class!(
+	#[unsafe(super(NSApplication, NSResponder, NSObject))]
+	#[name = "GraphiteApplication"]
+	pub(super) struct GraphiteApplication;
+
+	impl GraphiteApplication {
+		#[unsafe(method(sendEvent:))]
+		fn send_event(&self, event: &NSEvent) {
+			// Route keyDown events straight to the key window to skip native menu shortcut handling.
+			if event.r#type() == NSEventType::KeyDown && let Some(key_window) = self.keyWindow() {
+				unsafe { msg_send![&key_window, sendEvent: event] }
+			} else {
+				unsafe { msg_send![super(self), sendEvent: event] }
+			}
+		}
+	}
+);