Optimize interaction

ichenpipi · ichenpipi · commit db4bc97fd4d4 · 2023-10-07T19:16:38.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.1.1] - 2023-10-07
+
+- Fix bugs
+- Optimize interaction
+
 ## [1.1.0] - 2023-09-06
 
 - Support categories
diff --git a/Editor/Scripts/CodeExecutorData.cs b/Editor/Scripts/CodeExecutorData.cs
@@ -229,6 +229,18 @@ public static void RemoveSnippet(string guid)
             snippets.Remove(snippet);
         }
 
+        public static void RemoveSnippetsWithCategory(string category)
+        {
+            foreach (SnippetInfo snippet in snippets.ToArray())
+            {
+                if (snippet.MatchCategory(category))
+                {
+                    s_GuidMap.Remove(snippet.guid);
+                    snippets.Remove(snippet);
+                }
+            }
+        }
+
         public static bool HasSnippet(string guid)
         {
             return (!string.IsNullOrEmpty(guid) && s_GuidMap.ContainsKey(guid));
diff --git a/Editor/Scripts/CodeExecutorManager.cs b/Editor/Scripts/CodeExecutorManager.cs
@@ -276,6 +276,19 @@ public static void RemoveSnippets(IEnumerable<string> guids)
             SaveData(true);
         }
 
+        /// <summary>
+        /// 移除代码段
+        /// </summary>
+        /// <param name="category">类别</param>
+        /// <param name="notify">通知</param>
+        public static void RemoveSnippetsWithCategory(string category, bool notify = true)
+        {
+            // 更新数据
+            CodeExecutorData.RemoveSnippetsWithCategory(category);
+            // 保存到本地并通知更新
+            SaveData(notify);
+        }
+
         #endregion
 
         #region Data: Snippet Info
diff --git a/Editor/Scripts/Window/Content/Detail/CodeExecutorWindowCodeEditor.cs b/Editor/Scripts/Window/Content/Detail/CodeExecutorWindowCodeEditor.cs
@@ -19,17 +19,17 @@ public partial class CodeExecutorWindow
         private VisualElement m_CodeEditor = null;
 
         /// <summary>
-        /// 代码编辑器滚动视图
+        /// 代码滚动视图
         /// </summary>
         private ScrollView m_CodeScrollView = null;
 
         /// <summary>
-        /// 代码编辑器输入框
+        /// 代码文本框
         /// </summary>
         private TextField m_CodeTextField = null;
 
         /// <summary>
-        /// 代码编辑器输入框
+        /// 代码文本框
         /// </summary>
         private VisualElement m_CodeTextFieldTextInput = null;
 
@@ -81,8 +81,10 @@ private void InitCodeEditor()
                 }
             };
             m_CodeEditor.Add(m_CodeScrollView);
+            // 代码滚动视图形变回调
+            m_CodeScrollView.RegisterCallback<GeometryChangedEvent>(OnCodeScrollViewGeometryChangedEvent);
 
-            // 代码输入框
+            // 代码文本框
             m_CodeTextField = new TextField()
             {
                 name = "TextField",
@@ -101,7 +103,7 @@ private void InitCodeEditor()
                 }
             };
             m_CodeScrollView.Add(m_CodeTextField);
-
+            // 样式Hack
             {
                 // 输入框文本设为左上对齐
                 VisualElement textInput = m_CodeTextFieldTextInput = m_CodeTextField.Q<VisualElement>("unity-text-input");
@@ -117,15 +119,11 @@ private void InitCodeEditor()
                 textInput.style.borderBottomLeftRadius = 0;
                 textInput.style.borderBottomRightRadius = 0;
             }
-
-            // 滚动视图变化回调
-            m_CodeScrollView.RegisterCallback<GeometryChangedEvent>(OnCodeScrollViewGeometryChangedEventChanged);
-
-            // 输入框内容变化回调
+            // 内容变化回调
             m_CodeTextField.RegisterValueChangedCallback(OnCodeTextFieldValueChanged);
-            // 输入框键盘按下回调
+            // 键盘按下回调
             m_CodeTextField.RegisterCallback<KeyDownEvent>(OnCodeTextFieldKeyDown);
-            // 输入框鼠标滚轮回调
+            // 鼠标滚轮回调
             m_CodeTextField.RegisterCallback<WheelEvent>(OnCodeTextFieldMouseWheel);
 
             // 复制到剪切板按钮
@@ -162,19 +160,22 @@ private void InitCodeEditor()
         }
 
         /// <summary>
-        /// 滚动视图变化回调
+        /// 代码滚动视图形变回调
         /// </summary>
         /// <param name="evt"></param>
-        private void OnCodeScrollViewGeometryChangedEventChanged(GeometryChangedEvent evt)
+        private void OnCodeScrollViewGeometryChangedEvent(GeometryChangedEvent evt)
         {
             EditorApplication.delayCall += UpdateCodeTextFieldHeight;
+        }
 
-            void UpdateCodeTextFieldHeight()
-            {
-                if (m_CodeScrollView == null) return;
-                float height = m_CodeScrollView.contentViewport.localBound.height;
-                m_CodeTextField.style.minHeight = height;
-            }
+        /// <summary>
+        /// 更新代码文本元素高度
+        /// </summary>
+        private void UpdateCodeTextFieldHeight()
+        {
+            if (m_CodeScrollView == null) return;
+            float height = m_CodeScrollView.contentViewport.localBound.height;
+            m_CodeTextField.style.minHeight = height;
         }
 
         /// <summary>
@@ -183,7 +184,6 @@ void UpdateCodeTextFieldHeight()
         /// <param name="evt"></param>
         private void OnCodeTextFieldValueChanged(ChangeEvent<string> evt)
         {
-            if (m_CodeTextField.isReadOnly) return;
             if (m_CurrSnippetInfo == null) return;
             // 更新数据
             string code = m_CodeTextField.value;
@@ -322,10 +322,13 @@ private int SetCodeEditorFontSize(int size)
 
         private void SetCodeEditorEditable(bool isEditable, bool focus = false)
         {
-            // 输入框只读
+            // 文本框只读
             m_CodeTextField.isReadOnly = !isEditable;
-            // 输入框背景颜色
-            m_CodeTextFieldTextInput.style.backgroundColor = (isEditable ? textFieldNormalBgColor : textFieldReadOnlyBgColor);
+
+            // 背景颜色
+            Color bgColor = (isEditable ? textFieldNormalBgColor : textFieldReadOnlyBgColor);
+            m_CodeScrollView.style.backgroundColor = bgColor;
+            m_CodeTextFieldTextInput.style.backgroundColor = bgColor;
             // 边框颜色
             Color borderColor = (isEditable ? textFieldNormalBorderColor : textFieldReadOnlyBorderColor);
             m_CodeScrollView.style.borderTopColor = borderColor;
diff --git a/Editor/Scripts/Window/Content/Detail/CodeExecutorWindowHeader.cs b/Editor/Scripts/Window/Content/Detail/CodeExecutorWindowHeader.cs
@@ -110,7 +110,7 @@ private void InitHeadline()
             m_EditButton = new ButtonWithIcon()
             {
                 name = "EditButton",
-                tooltip = "Edit snippet",
+                tooltip = "Edit current snippet",
                 focusable = false,
                 style =
                 {
diff --git a/Editor/Scripts/Window/Content/Sidebar/CodeExecutorWindowSnippetTreeView.cs b/Editor/Scripts/Window/Content/Sidebar/CodeExecutorWindowSnippetTreeView.cs
@@ -688,20 +688,17 @@ private void DuplicateSelectedSnippets()
         private void DeleteSelectedSnippets()
         {
             List<SnippetInfo> snippets = GetSnippetTreeViewSelectedSnippets(true);
-            string[] names = snippets.Select(v => $"- {v.name}").ToArray();
+
             bool isOk = EditorUtility.DisplayDialog(
                 "[Code Executor] Delete snippets",
-                $"Are you sure to delete the following snippets?\n{string.Join("\n", names)}",
+                $"Are you sure to delete the following snippets?\n{string.Join("\n", snippets.Select(v => $"- {v.name}"))}",
                 "Confirm!",
                 "Cancel"
             );
-            if (!isOk)
-            {
-                return;
-            }
-            string[] guids = snippets.Select(v => v.guid).ToArray();
-            CodeExecutorManager.RemoveSnippets(guids);
-            // 提示
+            if (!isOk) return;
+
+            CodeExecutorManager.RemoveSnippets(snippets.Select(v => v.guid));
+
             ShowNotification("Deleted");
         }
 
@@ -710,17 +707,36 @@ private void DeleteSelectedSnippets()
         /// </summary>
         private void DeleteSelectedCategories()
         {
-            List<CustomTreeViewItem> items = GetSelectedSnippetTreeViewItems();
-            for (int i = 0; i < items.Count; i++)
+            List<string> categories = new List<string>();
+            foreach (CustomTreeViewItem item in GetSelectedSnippetTreeViewItems())
             {
-                CustomTreeViewItem item = items[i];
                 if (item.isContainer)
                 {
-                    string category = item.displayName;
-                    bool notify = (i == items.Count - 1);
-                    CodeExecutorManager.RemoveCategory(category, notify);
+                    categories.Add(item.displayName);
+                }
+            }
+
+            int dialogResult = EditorUtility.DisplayDialogComplex(
+                "[Code Executor] Delete categories",
+                $"Whether to delete snippets under these categories?\n{string.Join("\n", categories.Select(v => $"- {v}"))}",
+                "Keep snippets!",
+                "Cancel",
+                "Delete!"
+            );
+            if (dialogResult == 1) return;
+
+            for (int i = 0; i < categories.Count; i++)
+            {
+                string category = categories[i];
+                if (dialogResult == 2)
+                {
+                    CodeExecutorManager.RemoveSnippetsWithCategory(category, false);
                 }
+                bool notify = (i == categories.Count - 1);
+                CodeExecutorManager.RemoveCategory(category, notify);
             }
+
+            ShowNotification("Deleted");
         }
 
         #endregion
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "com.chenpipi.code-executor",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "unity": "2020.2",
     "displayName": "Code Executor",
     "keywords": [

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ private void InitHeadline()`
`110`	`110`	`m_EditButton = new ButtonWithIcon()`
`111`	`111`	`{`
`112`	`112`	`name = "EditButton",`
`113`		`- tooltip = "Edit snippet",`
	`113`	`+ tooltip = "Edit current snippet",`
`114`	`114`	`focusable = false,`
`115`	`115`	`style =`
`116`	`116`	`{`
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.0",`
	`3`	`+ "version": "1.1.1",`
`4`	`4`	`"unity": "2020.2",`
`5`	`5`	`"displayName": "Code Executor",`
`6`	`6`	`"keywords": [`