fix recent desktop mac breakages

Author: timon-schelling

desktop/wrapper/src/intercept_frontend_message.rs

@@ -111,10 +111,7 @@ pub(super) fn intercept_frontend_message(dispatcher: &mut DesktopWrapperMessageD
 			dispatcher.respond(DesktopFrontendMessage::PersistenceLoadPreferences);
 		}
 		#[cfg(target_os = "macos")]
-		FrontendMessage::UpdateMenuBarLayout {
-			layout_target: graphite_editor::messages::tool::tool_messages::tool_prelude::LayoutTarget::MenuBar,
-			diff,
-		} => {
+		FrontendMessage::UpdateMenuBarLayout { diff } => {
 			use graphite_editor::messages::tool::tool_messages::tool_prelude::{DiffUpdate, WidgetDiff};
 			match diff.as_slice() {
 				[

desktop/wrapper/src/utils.rs

@@ -10,7 +10,7 @@ pub(crate) mod menu {
 
 	use crate::messages::{EditorMessage, KeyCode, MenuItem, Modifiers, Shortcut};
 
-	pub(crate) fn convert_menu_bar_layout_to_menu_items(layout: &Layout) -> Vec<MenuItem> {
+	pub(crate) fn convert_menu_bar_layout_to_menu_items(Layout(layout): &Layout) -> Vec<MenuItem> {
 		let layout_group = match layout.as_slice() {
 			[layout_group] => layout_group,
 			_ => panic!("Menu bar layout is supposed to have exactly one layout group"),

editor/src/messages/layout/layout_message_handler.rs

@@ -488,7 +488,7 @@ impl LayoutMessageHandler {
 		if layout_target == LayoutTarget::MenuBar {
 			widget_diffs = vec![WidgetDiff {
 				widget_path: Vec::new(),
-				new_value: DiffUpdate::Layout(current.layout.clone()),
+				new_value: DiffUpdate::Layout(self.layouts[LayoutTarget::MenuBar as usize].clone()),
 			}];
 		}