Optimize interaction

Author: ichenpipi

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.1.2] - 2023-10-12
+
+- Fix bugs
+- Optimize interaction
+
 ## [1.1.1] - 2023-10-07
 
 - Fix bugs

Editor/Scripts/Window/Content/CodeExecutorWindowDetail.cs

@@ -104,7 +104,7 @@ private void OnDetailGeometryChangedEventChanged(GeometryChangedEvent evt) { }
         /// <param name="modeName"></param>
         private void ExecuteSnippet(string snippetName, string codeText, string modeName)
         {
-            if (modeName.Equals(CodeExecutorManager.DefaultExecMode.name, StringComparison.OrdinalIgnoreCase))
+            if (modeName == null || modeName.Equals(CodeExecutorManager.DefaultExecMode.name, StringComparison.OrdinalIgnoreCase))
             {
                 ShowNotification($"Please select a valid execution mode!", 1f);
                 return;

Editor/Scripts/Window/Content/Sidebar/CodeExecutorWindowNewItem.cs

@@ -39,9 +39,8 @@ private void InitNewCodeItem()
             m_NewItem.SetIcon(PipiUtility.GetIcon("CreateAddNew"));
             // 点击回调
             m_NewItem.RegisterCallback<MouseDownEvent>(OnNewCodeItemMouseDown);
-            // 菜单回调
-            m_NewItem.AddManipulator(new ContextualMenuManipulator(null));
-            m_NewItem.RegisterCallback<ContextualMenuPopulateEvent>(OnNewCodeItemContextualMenuPopulate);
+            // 右键菜单
+            m_NewItem.AddManipulator(new ContextualMenuManipulator(NewCodeItemMenuBuilder));
             m_Sidebar.Add(m_NewItem);
         }
 
@@ -50,11 +49,11 @@ private void OnNewCodeItemMouseDown(MouseDownEvent evt)
             Switch(CodeExecutorData.newSnippet);
         }
 
-        private void OnNewCodeItemContextualMenuPopulate(ContextualMenuPopulateEvent evt)
+        private void NewCodeItemMenuBuilder(ContextualMenuPopulateEvent evt)
         {
-            evt.menu.AppendAction("Create Empty Snippet", action =>
+            evt.menu.AppendAction("Create New Empty Snippet", action =>
             {
-                SaveAsNewSnippet(string.Empty);
+                SnippetTreeViewMenu_CreateNewSnippet();
             });
         }
 

Editor/Scripts/Window/Content/Sidebar/CodeExecutorWindowSnippetTreeView.cs

@@ -105,13 +105,13 @@ private void OnSnippetTreeViewKeyDown(Event evt)
             {
                 DuplicateSelectedSnippets();
             }
-            // Ctrl + Numpad -
-            else if (evt.control && evt.keyCode == KeyCode.KeypadMinus)
+            // Ctrl + Numpad- / Ctrl + [
+            else if (evt.control && (evt.keyCode == KeyCode.KeypadMinus || evt.keyCode == KeyCode.LeftBracket))
             {
                 SnippetTreeViewCollapseAllCategories();
             }
-            // Ctrl + Numpad +
-            else if (evt.control && evt.keyCode == KeyCode.KeypadPlus)
+            // Ctrl + Numpad+ / Ctrl + ]
+            else if (evt.control && (evt.keyCode == KeyCode.KeypadPlus || evt.keyCode == KeyCode.RightBracket))
             {
                 SnippetTreeViewExpandAllCategories();
             }

Editor/Scripts/Window/Content/Sidebar/CodeExecutorWindowSnippetTreeViewMenu.cs

@@ -20,6 +20,8 @@ private static class SnippetTreeViewMenuContent
             public static readonly GUIContent Top = new GUIContent("Top");
             public static readonly GUIContent UnTop = new GUIContent("Un-top");
             public static readonly GUIContent Delete = new GUIContent("Delete");
+            public static readonly GUIContent CreateNewSnippet = new GUIContent("Create New Snippet");
+            public static readonly GUIContent CreateNewSnippetUnderCategory = new GUIContent("Create New Snippet Under Category");
             public static readonly GUIContent CreateNewCategory = new GUIContent("Create New Category");
             public static readonly GUIContent CollapseAllCategories = new GUIContent("Collapse All");
             public static readonly GUIContent ExpandAllCategories = new GUIContent("Expand All");
@@ -33,6 +35,7 @@ private static class SnippetTreeViewMenuContent
         /// <param name="menu"></param>
         private void BuildSnippetTreeViewMenu(GenericMenu menu)
         {
+            menu.AddItem(SnippetTreeViewMenuContent.CreateNewSnippet, false, SnippetTreeViewMenu_CreateNewSnippet);
             menu.AddItem(SnippetTreeViewMenuContent.CreateNewCategory, false, SnippetTreeViewMenu_CreateNewCategory);
 
             menu.AddSeparator(string.Empty);
@@ -95,6 +98,7 @@ private void BuildSnippetTreeViewItemMenuSnippet(GenericMenu menu, int itemID)
             }
 
             menu.AddSeparator(string.Empty);
+            menu.AddItem(SnippetTreeViewMenuContent.CreateNewSnippetUnderCategory, false, SnippetTreeViewMenu_CreateNewSnippetUnderCategory, itemID);
             menu.AddItem(SnippetTreeViewMenuContent.CreateNewCategory, false, SnippetTreeViewMenu_CreateNewCategory);
 
             menu.AddSeparator(string.Empty);
@@ -111,6 +115,7 @@ private void BuildSnippetTreeViewItemMenuCategory(GenericMenu menu, int itemID)
             else menu.AddItem(SnippetTreeViewMenuContent.Delete, false, SnippetTreeViewMenu_DeleteCategory, itemID);
 
             menu.AddSeparator(string.Empty);
+            menu.AddItem(SnippetTreeViewMenuContent.CreateNewSnippetUnderCategory, false, SnippetTreeViewMenu_CreateNewSnippetUnderCategory, itemID);
             menu.AddItem(SnippetTreeViewMenuContent.CreateNewCategory, false, SnippetTreeViewMenu_CreateNewCategory);
 
             menu.AddSeparator(string.Empty);
@@ -202,6 +207,17 @@ private void SnippetTreeViewMenu_PasteFromClipboard()
             DoPasteFromClipboard();
         }
 
+        private void SnippetTreeViewMenu_CreateNewSnippet()
+        {
+            SaveAsNewSnippet(string.Empty, null, CodeExecutorManager.DefaultExecMode.name, null);
+        }
+
+        private void SnippetTreeViewMenu_CreateNewSnippetUnderCategory(object itemID)
+        {
+            string category = GetSnippetCategoryBySnippetTreeViewItemId((int)itemID);
+            SaveAsNewSnippet(string.Empty, null, CodeExecutorManager.DefaultExecMode.name, category);
+        }
+
         private void SnippetTreeViewMenu_CreateNewCategory()
         {
             CreateNewCategory();

package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.chenpipi.code-executor",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "unity": "2020.2",
     "displayName": "Code Executor",
     "keywords": [