cleanup

Author: timon-schelling

desktop/wrapper/src/handle_desktop_wrapper_message.rs

@@ -1,11 +1,10 @@
 use graphene_std::Color;
 use graphene_std::raster::Image;
 use graphite_editor::messages::app_window::app_window_message_handler::AppWindowPlatform;
-use graphite_editor::messages::layout::LayoutMessage;
 use graphite_editor::messages::prelude::*;
-use graphite_editor::messages::tool::tool_messages::tool_prelude::{LayoutTarget, WidgetId};
 
 use crate::messages::Platform;
+use crate::utils::menu::parse_item_path;
 
 use super::DesktopWrapperMessageDispatcher;
 use super::messages::{DesktopFrontendMessage, DesktopWrapperMessage, EditorMessage, OpenFileDialogContext, SaveFileDialogContext};
@@ -151,28 +150,11 @@ pub(super) fn handle_desktop_wrapper_message(dispatcher: &mut DesktopWrapperMess
 			dispatcher.queue_editor_message(message);
 		}
 		DesktopWrapperMessage::MenuEvent { id } => {
-			let mut id_parts = id.split(':');
-			let Some(widget_id) = id_parts.next() else {
+			if let Some(message) = parse_item_path(id) {
+				dispatcher.queue_editor_message(message);
+			} else {
 				tracing::error!("Received a malformed MenuEvent id");
-				return;
-			};
-			let widget_id = widget_id.parse::<u64>().unwrap();
-
-			let value = id_parts
-				.map(|part| {
-					use base64::prelude::*;
-					let bytes = base64::engine::general_purpose::STANDARD.decode(part).unwrap();
-					String::from_utf8(bytes).unwrap()
-				})
-				.collect::<Vec<_>>();
-			let value = serde_json::to_value(value).unwrap();
-
-			let message = LayoutMessage::WidgetValueUpdate {
-				layout_target: LayoutTarget::MenuBar,
-				widget_id: WidgetId(widget_id),
-				value,
-			};
-			dispatcher.queue_editor_message(message);
+			}
 		}
 	}
 }

desktop/wrapper/src/intercept_frontend_message.rs

@@ -123,13 +123,10 @@ pub(super) fn intercept_frontend_message(dispatcher: &mut DesktopWrapperMessageD
 						new_value: DiffUpdate::SubLayout(layout),
 					},
 				] if widget_path.is_empty() => {
-					let entries = crate::utils::menu::convert_menu_bar_entries_to_menu_items(layout);
+					let entries = crate::utils::menu::convert_menu_bar_layout_to_menu_items(layout);
 					dispatcher.respond(DesktopFrontendMessage::UpdateMenu { entries });
 				}
-				u => {
-					dbg!(u);
-					tracing::error!("received invalid MeneBar update")
-				}
+				_ => {}
 			}
 		}
 		FrontendMessage::WindowClose => {

desktop/wrapper/src/utils.rs

@@ -1,28 +1,31 @@
 #[cfg(target_os = "macos")]
 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, LayoutKey, LayoutKeysGroup};
 	use graphite_editor::messages::input_mapper::utility_types::misc::ActionKeys;
-	use graphite_editor::messages::tool::tool_messages::tool_prelude::{LayoutGroup, MenuListEntry, SubLayout, Widget};
+	use graphite_editor::messages::layout::LayoutMessage;
+	use graphite_editor::messages::tool::tool_messages::tool_prelude::{LayoutGroup, LayoutTarget, MenuListEntry, SubLayout, Widget, WidgetId};
 
-	use crate::messages::{KeyCode, MenuItem, Modifiers, Shortcut};
+	use crate::messages::{EditorMessage, KeyCode, MenuItem, Modifiers, Shortcut};
 
-	pub(crate) fn convert_menu_bar_entries_to_menu_items(layout: &SubLayout) -> Vec<MenuItem> {
+	pub(crate) fn convert_menu_bar_layout_to_menu_items(layout: &SubLayout) -> 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"),
 		};
 		let LayoutGroup::Row { widgets } = layout_group else {
 			panic!("Menu bar layout group is supposed to be a row");
 		};
-		println!("");
 		widgets
 			.into_iter()
 			.map(|widget| {
 				let text_button = match &widget.widget {
 					Widget::TextButton(text_button) => text_button,
 					_ => panic!("Menu bar layout top-level widgets are supposed to be text buttons"),
 				};
-                
+
 				MenuItem::SubMenu {
 					id: widget.widget_id.to_string(),
 					text: text_button.label.clone(),
@@ -33,15 +36,30 @@ pub(crate) mod menu {
 			.collect::<Vec<MenuItem>>()
 	}
 
-	fn item_path_to_string(widget_id: u64, path: Vec<String>) -> String {
-		let path = path
-			.into_iter()
-			.map(|element| {
-				use base64::prelude::*;
-				base64::engine::general_purpose::STANDARD.encode(element)
+	pub(crate) fn parse_item_path(id: String) -> Option<EditorMessage> {
+		let mut id_parts = id.split(':');
+		let widget_id = id_parts.next()?.parse::<u64>().ok()?;
+
+		let value = id_parts
+			.map(|part| {
+				let bytes = BASE64.decode(part).ok()?;
+				String::from_utf8(bytes).ok()
 			})
-			.collect::<Vec<_>>()
-			.join(":");
+			.collect::<Option<Vec<String>>>()?;
+		let value = serde_json::to_value(value).ok()?;
+
+		Some(
+			LayoutMessage::WidgetValueUpdate {
+				layout_target: LayoutTarget::MenuBar,
+				widget_id: WidgetId(widget_id),
+				value,
+			}
+			.into(),
+		)
+	}
+
+	fn item_path_to_string(widget_id: u64, path: Vec<String>) -> String {
+		let path = path.into_iter().map(|element| BASE64.encode(element)).collect::<Vec<_>>().join(":");
 		format!("{widget_id}:{path}")
 	}
 

editor/src/messages/layout/layout_message_handler.rs

@@ -484,7 +484,7 @@ impl LayoutMessageHandler {
 					widget_diffs = vec![WidgetDiff {
 						widget_path: Vec::new(),
 						new_value: DiffUpdate::SubLayout(current.layout.clone()),
-					}]
+					}];
 				}
 
 				self.send_diff(widget_diffs, layout_target, responses, action_input_mapping);