Skip to content

Commit 6ff9616

Browse files
committed
Optimize interaction
1 parent 408f7bc commit 6ff9616

File tree

7 files changed

+216
-612
lines changed

7 files changed

+216
-612
lines changed

Editor/Scripts/CodeExecutorManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public static bool SetSnippetName(string guid, string name)
303303
if (name.IndexOfAny(s_InvalidNameChars) != -1)
304304
{
305305
EditorUtility.DisplayDialog(
306-
"[CodeExecutor] Invalid display name",
306+
"[Code Executor] Invalid display name",
307307
$"A valid name can't contain any of the following characters: {s_InvalidNameChars.Join("")}",
308308
"OK"
309309
);

Editor/Scripts/Window/CodeExecutorWindowContent.cs

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,15 @@ private bool IsContentReady()
119119
private SnippetInfo m_CurrSnippetInfo = null;
120120

121121
/// <summary>
122-
/// 当前选中
122+
/// 当前选中代码段
123123
/// </summary>
124124
private string m_SelectedSnippetGuid = null;
125125

126+
/// <summary>
127+
/// 当前选中类别
128+
/// </summary>
129+
private string m_SelectedCategory = null;
130+
126131
/// <summary>
127132
/// 更新内容
128133
/// </summary>
@@ -175,14 +180,23 @@ private void Switch(SnippetInfo snippet)
175180

176181
// 更新界面状态
177182
UpdateNewCodeItemStyle(isNew);
183+
178184
// 更新列表状态
179-
if (isNew)
185+
if (string.IsNullOrEmpty(m_SelectedCategory))
180186
{
181-
ClearSnippetTreeViewSelection(false);
187+
if (isNew)
188+
{
189+
ClearSnippetTreeViewSelection(false);
190+
}
191+
else
192+
{
193+
SetSnippetTreeViewSelection(m_SelectedSnippetGuid, false);
194+
}
182195
}
183196
else
184197
{
185-
SetSnippetTreeViewSelection(m_SelectedSnippetGuid, false);
198+
int itemID = GetSnippetTreeViewItemIdByCategory(m_SelectedCategory);
199+
if (itemID >= 0) SetSnippetTreeViewSelection(itemID, false);
186200
}
187201

188202
// 设置标题

Editor/Scripts/Window/CodeExecutorWindowHotkeys.cs

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -28,51 +28,24 @@ private void RegisterHotkeys()
2828
FocusToSearchField();
2929
}
3030
// Ctrl + C
31-
else if (evt.ctrlKey && evt.keyCode == KeyCode.C)
32-
{
33-
}
31+
else if (evt.ctrlKey && evt.keyCode == KeyCode.C) { }
3432
// Ctrl + V
35-
else if (evt.ctrlKey && evt.keyCode == KeyCode.V)
36-
{
37-
}
33+
else if (evt.ctrlKey && evt.keyCode == KeyCode.V) { }
3834
// Ctrl + D
39-
else if (evt.keyCode == KeyCode.Z)
40-
{
41-
}
35+
else if (evt.keyCode == KeyCode.D) { }
4236
// Ctrl + Z
43-
else if (evt.keyCode == KeyCode.Z)
44-
{
45-
}
37+
else if (evt.keyCode == KeyCode.Z) { }
4638
// Ctrl + Shift + Z
47-
else if (evt.shiftKey && evt.keyCode == KeyCode.Z)
48-
{
49-
}
39+
else if (evt.shiftKey && evt.keyCode == KeyCode.Z) { }
5040
// F2
51-
else if (evt.keyCode == KeyCode.F2)
52-
{
53-
}
41+
else if (evt.keyCode == KeyCode.F2) { }
5442
// F5
5543
else if (evt.keyCode == KeyCode.F5)
5644
{
57-
Menu_Reload();
45+
Reload();
5846
}
5947
// Delete / Backspace
60-
else if (evt.keyCode == KeyCode.Delete || evt.keyCode == KeyCode.Backspace)
61-
{
62-
List<SnippetInfo> snippets = GetSnippetTreeViewSelectedSnippets(true);
63-
string[] names = snippets.Select(v => $"- {v.name}").ToArray();
64-
bool isOk = EditorUtility.DisplayDialog(
65-
"[Code Executor] Delete snippets",
66-
$"Are you sure to delete the following snippets?\n{string.Join("\n", names)}",
67-
"Confirm!",
68-
"Cancel"
69-
);
70-
if (isOk)
71-
{
72-
string[] guids = snippets.Select(v => v.guid).ToArray();
73-
CodeExecutorManager.RemoveSnippets(guids);
74-
}
75-
}
48+
else if (evt.keyCode == KeyCode.Delete || evt.keyCode == KeyCode.Backspace) { }
7649
// 不响应
7750
else
7851
{

0 commit comments

Comments
 (0)