From feba87449bb490e47df6f267576bec5ab4238dc3 Mon Sep 17 00:00:00 2001
From: Keavon Chambers <keavon@keavon.com>
Date: Thu, 26 Dec 2024 16:31:13 -0800
Subject: [PATCH] Add more actions to the Layer menu bar entries

---
 .../utility_types/input_keyboard.rs           |  5 +++
 .../menu_bar/menu_bar_message_handler.rs      | 34 ++++++++++++++-----
 .../widgets/labels/UserInputLabel.svelte      |  5 ++-
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/editor/src/messages/input_mapper/utility_types/input_keyboard.rs b/editor/src/messages/input_mapper/utility_types/input_keyboard.rs
index 02459b90..625c33d4 100644
--- a/editor/src/messages/input_mapper/utility_types/input_keyboard.rs
+++ b/editor/src/messages/input_mapper/utility_types/input_keyboard.rs
@@ -290,6 +290,11 @@ impl fmt::Display for Key {
 				KeyboardPlatformLayout::Standard => "Ctrl",
 				KeyboardPlatformLayout::Mac => "⌘",
 			},
+			Self::MouseLeft => "LMB",
+			Self::MouseRight => "RMB",
+			Self::MouseMiddle => "MMB",
+			Self::MouseBack => "Mouse Back",
+			Self::MouseForward => "Mouse Fwd",
 
 			_ => key_name.as_str(),
 		};
diff --git a/editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs b/editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs
index a50bc2a8..b172fd81 100644
--- a/editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs
+++ b/editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs
@@ -183,6 +183,14 @@ impl LayoutHolder for MenuBarMessageHandler {
 				"Layer".into(),
 				no_active_document,
 				MenuBarEntryChildren(vec![
+					vec![MenuBarEntry {
+						label: "New".into(),
+						icon: Some("NewLayer".into()),
+						shortcut: action_keys!(DocumentMessageDiscriminant::CreateEmptyFolder),
+						action: MenuBarEntry::create_action(|_| DocumentMessage::CreateEmptyFolder.into()),
+						disabled: no_active_document,
+						..MenuBarEntry::default()
+					}],
 					vec![
 						MenuBarEntry {
 							label: "Select All".into(),
@@ -213,14 +221,24 @@ impl LayoutHolder for MenuBarMessageHandler {
 							..MenuBarEntry::default()
 						},
 					],
-					vec![MenuBarEntry {
-						label: "Delete Selected".into(),
-						icon: Some("Trash".into()),
-						shortcut: action_keys!(DocumentMessageDiscriminant::DeleteSelectedLayers),
-						action: MenuBarEntry::create_action(|_| DocumentMessage::DeleteSelectedLayers.into()),
-						disabled: no_active_document || !has_selected_nodes,
-						..MenuBarEntry::default()
-					}],
+					vec![
+						MenuBarEntry {
+							label: "Group Selected".into(),
+							icon: Some("Folder".into()),
+							shortcut: action_keys!(DocumentMessageDiscriminant::GroupSelectedLayers),
+							action: MenuBarEntry::create_action(|_| DocumentMessage::GroupSelectedLayers.into()),
+							disabled: no_active_document || !has_selected_layers,
+							..MenuBarEntry::default()
+						},
+						MenuBarEntry {
+							label: "Delete Selected".into(),
+							icon: Some("Trash".into()),
+							shortcut: action_keys!(DocumentMessageDiscriminant::DeleteSelectedLayers),
+							action: MenuBarEntry::create_action(|_| DocumentMessage::DeleteSelectedLayers.into()),
+							disabled: no_active_document || !has_selected_nodes,
+							..MenuBarEntry::default()
+						},
+					],
 					vec![
 						MenuBarEntry {
 							label: "Grab Selected".into(),
diff --git a/frontend/src/components/widgets/labels/UserInputLabel.svelte b/frontend/src/components/widgets/labels/UserInputLabel.svelte
index ed970fad..50c7ca7b 100644
--- a/frontend/src/components/widgets/labels/UserInputLabel.svelte
+++ b/frontend/src/components/widgets/labels/UserInputLabel.svelte
@@ -164,9 +164,8 @@
 					margin: calc(calc(18px - 12px) / 2) 0;
 				}
 
-				& + .input-key::before {
-					line-height: 18px;
-					content: "+";
+				& + .input-key {
+					margin-left: 4px;
 				}
 			}
 		}