From 4292ac177b2992baaed1798be082d59bb91a11ea Mon Sep 17 00:00:00 2001
From: maxichrome <maxichrome@users.noreply.github.com>
Date: Fri, 10 Jun 2022 21:54:50 -0500
Subject: [PATCH] extract custom menu

---
 apps/desktop/src-tauri/src/menu.rs | 86 +++++++++++++-----------------
 1 file changed, 38 insertions(+), 48 deletions(-)

diff --git a/apps/desktop/src-tauri/src/menu.rs b/apps/desktop/src-tauri/src/menu.rs
index ac32f55f7..31cdf0b50 100644
--- a/apps/desktop/src-tauri/src/menu.rs
+++ b/apps/desktop/src-tauri/src/menu.rs
@@ -17,61 +17,51 @@ fn custom_menu_bar() -> Menu {
 	//   "File",
 	//   Menu::new().add_item(quit).add_item(close).add_item(jeff),
 	// );
-	let spacedrive = Submenu::new(
-		"Spacedrive",
-		Menu::new()
-			.add_native_item(MenuItem::About(
-				"Spacedrive".to_string(),
-				AboutMetadata::new(),
-			)) // TODO: fill out about metadata
-			.add_native_item(MenuItem::Separator)
-			.add_native_item(MenuItem::Services)
-			.add_native_item(MenuItem::Separator)
-			.add_native_item(MenuItem::Hide)
-			.add_native_item(MenuItem::HideOthers)
-			.add_native_item(MenuItem::ShowAll)
-			.add_native_item(MenuItem::Separator)
-			.add_native_item(MenuItem::Quit),
-	);
+	let app_menu = Menu::new()
+		.add_native_item(MenuItem::About(
+			"Spacedrive".to_string(),
+			AboutMetadata::new(),
+		)) // TODO: fill out about metadata
+		.add_native_item(MenuItem::Separator)
+		.add_native_item(MenuItem::Services)
+		.add_native_item(MenuItem::Separator)
+		.add_native_item(MenuItem::Hide)
+		.add_native_item(MenuItem::HideOthers)
+		.add_native_item(MenuItem::ShowAll)
+		.add_native_item(MenuItem::Separator)
+		.add_native_item(MenuItem::Quit);
+
+	let file_menu = Menu::new()
+		.add_item(
+			CustomMenuItem::new("new_window".to_string(), "New Window")
+				.accelerator("CmdOrCtrl+N")
+				.disabled(),
+		)
+		.add_item(
+			CustomMenuItem::new("close".to_string(), "Close Window").accelerator("CmdOrCtrl+W"),
+		);
+	let edit_menu = Menu::new()
+		.add_native_item(MenuItem::Copy)
+		.add_native_item(MenuItem::Paste);
+	let view_menu = Menu::new()
+		.add_item(
+			CustomMenuItem::new("command_pallete".to_string(), "Command Pallete")
+				.accelerator("CmdOrCtrl+P"),
+		)
+		.add_item(CustomMenuItem::new("layout".to_string(), "Layout").disabled());
+	let window_menu = Menu::new().add_native_item(MenuItem::EnterFullScreen);
 
-	let file = Submenu::new(
-		"File",
-		Menu::new()
-			.add_item(
-				CustomMenuItem::new("new_window".to_string(), "New Window")
-					.accelerator("CmdOrCtrl+N")
-					.disabled(),
-			)
-			.add_item(
-				CustomMenuItem::new("close".to_string(), "Close Window").accelerator("CmdOrCtrl+W"),
-			),
-	);
-	let edit = Submenu::new(
-		"Edit",
-		Menu::new()
-			.add_native_item(MenuItem::Copy)
-			.add_native_item(MenuItem::Paste),
-	);
-	let view = Submenu::new(
-		"View",
-		Menu::new()
-			.add_item(
-				CustomMenuItem::new("command_pallete".to_string(), "Command Pallete")
-					.accelerator("CmdOrCtrl+P"),
-			)
-			.add_item(CustomMenuItem::new("layout".to_string(), "Layout").disabled()),
-	);
 	let window = Submenu::new(
 		"Window",
 		Menu::new().add_native_item(MenuItem::EnterFullScreen),
 	);
 
 	let menu = Menu::new()
-		.add_submenu(spacedrive)
-		.add_submenu(file)
-		.add_submenu(edit)
-		.add_submenu(view)
-		.add_submenu(window);
+		.add_submenu(Submenu::new("Spacedrive", app_menu))
+		.add_submenu(Submenu::new("File", file_menu))
+		.add_submenu(Submenu::new("Edit", edit_menu))
+		.add_submenu(Submenu::new("View", view_menu))
+		.add_submenu(Submenu::new("Window", window_menu));
 
 	menu
 }