Optimize interaction

ichenpipi · ichenpipi · commit 9ff4a8b5dc00 · 2023-10-12T19:16:45.000+08:00
diff --git a/CHANGELOG.md b/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
diff --git a/Editor/Scripts/Window/Content/CodeExecutorWindowDetail.cs b/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;
diff --git a/Editor/Scripts/Window/Content/Sidebar/CodeExecutorWindowNewItem.cs b/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();
             });
         }
 
diff --git a/Editor/Scripts/Window/Content/Sidebar/CodeExecutorWindowSnippetTreeView.cs b/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();
             }
diff --git a/Editor/Scripts/Window/Content/Sidebar/CodeExecutorWindowSnippetTreeViewMenu.cs b/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();
diff --git a/package.json b/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": [

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ private void OnDetailGeometryChangedEventChanged(GeometryChangedEvent evt) { }`
`104`	`104`	`/// <param name="modeName"></param>`
`105`	`105`	`private void ExecuteSnippet(string snippetName, string codeText, string modeName)`
`106`	`106`	`{`
`107`		`- if (modeName.Equals(CodeExecutorManager.DefaultExecMode.name, StringComparison.OrdinalIgnoreCase))`
	`107`	`+ if (modeName == null \|\| modeName.Equals(CodeExecutorManager.DefaultExecMode.name, StringComparison.OrdinalIgnoreCase))`
`108`	`108`	`{`
`109`	`109`	`ShowNotification($"Please select a valid execution mode!", 1f);`
`110`	`110`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,8 @@ private void InitNewCodeItem()`
`39`	`39`	`m_NewItem.SetIcon(PipiUtility.GetIcon("CreateAddNew"));`
`40`	`40`	`// 点击回调`
`41`	`41`	`m_NewItem.RegisterCallback<MouseDownEvent>(OnNewCodeItemMouseDown);`
`42`		`- // 菜单回调`
`43`		`- m_NewItem.AddManipulator(new ContextualMenuManipulator(null));`
`44`		`- m_NewItem.RegisterCallback<ContextualMenuPopulateEvent>(OnNewCodeItemContextualMenuPopulate);`
	`42`	`+ // 右键菜单`
	`43`	`+ m_NewItem.AddManipulator(new ContextualMenuManipulator(NewCodeItemMenuBuilder));`
`45`	`44`	`m_Sidebar.Add(m_NewItem);`
`46`	`45`	`}`
`47`	`46`
`@@ -50,11 +49,11 @@ private void OnNewCodeItemMouseDown(MouseDownEvent evt)`
`50`	`49`	`Switch(CodeExecutorData.newSnippet);`
`51`	`50`	`}`
`52`	`51`
`53`		`- private void OnNewCodeItemContextualMenuPopulate(ContextualMenuPopulateEvent evt)`
	`52`	`+ private void NewCodeItemMenuBuilder(ContextualMenuPopulateEvent evt)`
`54`	`53`	`{`
`55`		`- evt.menu.AppendAction("Create Empty Snippet", action =>`
	`54`	`+ evt.menu.AppendAction("Create New Empty Snippet", action =>`
`56`	`55`	`{`
`57`		`- SaveAsNewSnippet(string.Empty);`
	`56`	`+ SnippetTreeViewMenu_CreateNewSnippet();`
`58`	`57`	`});`
`59`	`58`	`}`
`60`	`59`
Original file line number	Diff line number	Diff line change
`@@ -105,13 +105,13 @@ private void OnSnippetTreeViewKeyDown(Event evt)`
`105`	`105`	`{`
`106`	`106`	`DuplicateSelectedSnippets();`
`107`	`107`	`}`
`108`		`- // Ctrl + Numpad -`
`109`		`- else if (evt.control && evt.keyCode == KeyCode.KeypadMinus)`
	`108`	`+ // Ctrl + Numpad- / Ctrl + [`
	`109`	`+ else if (evt.control && (evt.keyCode == KeyCode.KeypadMinus \|\| evt.keyCode == KeyCode.LeftBracket))`
`110`	`110`	`{`
`111`	`111`	`SnippetTreeViewCollapseAllCategories();`
`112`	`112`	`}`
`113`		`- // Ctrl + Numpad +`
`114`		`- else if (evt.control && evt.keyCode == KeyCode.KeypadPlus)`
	`113`	`+ // Ctrl + Numpad+ / Ctrl + ]`
	`114`	`+ else if (evt.control && (evt.keyCode == KeyCode.KeypadPlus \|\| evt.keyCode == KeyCode.RightBracket))`
`115`	`115`	`{`
`116`	`116`	`SnippetTreeViewExpandAllCategories();`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.chenpipi.code-executor",`
`3`		`- "version": "1.1.1",`
	`3`	`+ "version": "1.1.2",`
`4`	`4`	`"unity": "2020.2",`
`5`	`5`	`"displayName": "Code Executor",`
`6`	`6`	`"keywords": [`