Review

Author: timon-schelling

desktop/src/app.rs

@@ -48,7 +48,6 @@ pub(crate) struct App {
 	#[cfg_attr(not(target_os = "macos"), expect(unused))]
 	preferences: Preferences,
 	launch_documents: Option<Vec<PathBuf>>,
-	disable_ui_acceleration: bool,
 	startup_time: Option<Instant>,
 	exiting: Arc<AtomicBool>,
 	exit_reason: ExitReason,
@@ -68,7 +67,6 @@ impl App {
 		app_event_scheduler: AppEventScheduler,
 		preferences: Preferences,
 		launch_documents: Vec<PathBuf>,
-		disable_ui_acceleration: bool,
 	) -> Self {
 		let ctrlc_app_event_scheduler = app_event_scheduler.clone();
 		ctrlc::set_handler(move || {
@@ -119,7 +117,6 @@ impl App {
 			web_communication_startup_buffer: Vec::new(),
 			preferences,
 			launch_documents: Some(launch_documents),
-			disable_ui_acceleration,
 			startup_time: None,
 			exiting,
 			exit_reason: ExitReason::Shutdown,
@@ -312,7 +309,7 @@ impl App {
 			}
 			DesktopFrontendMessage::OpenLaunchDocuments => {
 				let Some(launch_documents) = std::mem::take(&mut self.launch_documents) else {
-					tracing::error!("OpenLaunchDocuments should only be send once");
+					tracing::error!("OpenLaunchDocuments should only be sent once");
 					return;
 				};
 				self.open_files(launch_documents);
@@ -589,7 +586,7 @@ impl ApplicationHandler for App {
 				}
 
 				if !self.cef_init_successful
-					&& !self.disable_ui_acceleration
+					&& !self.preferences.disable_ui_acceleration
 					&& self.web_communication_initialized
 					&& let Some(startup_time) = self.startup_time
 					&& startup_time.elapsed() > Duration::from_secs(3)

desktop/src/cef/context/builder.rs

@@ -131,13 +131,13 @@ fn platform_settings(instance_dir: &Path) -> Settings {
 	{
 		let exe = std::env::current_exe().expect("cannot get current exe path");
 		let app_root = exe.parent().and_then(|p| p.parent()).expect("bad path structure").parent().expect("bad path structure");
-		return Settings {
+		Settings {
 			main_bundle_path: app_root.to_str().map(CefString::from).unwrap(),
 			multi_threaded_message_loop: 0,
 			external_message_pump: 1,
 			no_sandbox: 1, // GPU helper crashes when running with sandbox
 			..base
-		};
+		}
 	}
 
 	#[cfg(not(target_os = "macos"))]

desktop/src/lib.rs

@@ -67,7 +67,7 @@ pub fn start() {
 	// TODO: Eventually remove this cleanup code for the old "browser" CEF directory
 	dirs::delete_old_cef_browser_directory();
 
-	let prefs = preferences::read();
+	let mut prefs = preferences::read();
 
 	// Must be called before event loop initialization or native window integrations will break
 	App::init();
@@ -80,13 +80,15 @@ pub fn start() {
 
 	let (cef_view_info_sender, cef_view_info_receiver) = std::sync::mpsc::channel();
 
-	let disable_ui_acceleration = prefs.disable_ui_acceleration || cli.disable_ui_acceleration;
-	if disable_ui_acceleration {
+	if cli.disable_ui_acceleration {
+		prefs.disable_ui_acceleration = true;
+	}
+	if prefs.disable_ui_acceleration {
 		println!("UI acceleration is disabled");
 	}
 
 	let cef_handler = cef::CefHandler::new(wgpu_context.clone(), app_event_scheduler.clone(), cef_view_info_receiver);
-	let cef_context = match cef_context_builder.create(cef_handler, disable_ui_acceleration) {
+	let cef_context = match cef_context_builder.create(cef_handler, prefs.disable_ui_acceleration) {
 		Ok(context) => {
 			tracing::info!("CEF initialized successfully");
 			context
@@ -110,7 +112,6 @@ pub fn start() {
 		app_event_scheduler,
 		prefs,
 		cli.files,
-		cli.disable_ui_acceleration,
 	);
 
 	let exit_reason = app.run(event_loop);

desktop/src/window/mac/app.rs

@@ -47,10 +47,7 @@ define_class!(
 	unsafe impl NSApplicationDelegate for GraphiteApplicationDelegate {
 		#[unsafe(method(application:openURLs:))]
 		fn application_open_urls(&self, _application: &NSApplication, urls: &NSArray<NSURL>) {
-			let Some(app_event_scheduler) = APP_EVENT_SCHEDULER.lock().ok() else {
-				tracing::error!("Received macOS open URL event before the app event scheduler was initialized");
-				return;
-			};
+			let app_event_scheduler = APP_EVENT_SCHEDULER.lock().unwrap();
 
 			let mut pending_paths_to_open = LAUNCH_DOCUMENTS.lock().unwrap();