Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit cde9c2f

Browse files
StanleyGoldmanStanleyGoldman
committed
Merge branch 'enhancements/branches-view-rollup' into fixes/remote-branches-list-error
2 parents 5dce3eb + 8198c74 commit cde9c2f

File tree

8 files changed

+55
-90
lines changed

8 files changed

+55
-90
lines changed

‎src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,23 +107,19 @@ private void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)
107107
{
108108
if (!lastStatusChangedEvent.Equals(cacheUpdateEvent))
109109
{
110-
new ActionTask(TaskManager.Token, () => {
111-
lastStatusChangedEvent = cacheUpdateEvent;
112-
currentStatusHasUpdate = true;
113-
Redraw();
114-
}) { Affinity = TaskAffinity.UI }.Start();
110+
lastStatusChangedEvent = cacheUpdateEvent;
111+
currentStatusHasUpdate = true;
112+
Redraw();
115113
}
116114
}
117115

118116
private void RepositoryOnCurrentBranchChanged(CacheUpdateEvent cacheUpdateEvent)
119117
{
120118
if (!lastCurrentBranchChangedEvent.Equals(cacheUpdateEvent))
121119
{
122-
new ActionTask(TaskManager.Token, () => {
123-
lastCurrentBranchChangedEvent = cacheUpdateEvent;
124-
currentBranchHasUpdate = true;
125-
Redraw();
126-
}) { Affinity = TaskAffinity.UI }.Start();
120+
lastCurrentBranchChangedEvent = cacheUpdateEvent;
121+
currentBranchHasUpdate = true;
122+
Redraw();
127123
}
128124
}
129125

‎src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -296,35 +296,29 @@ private void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)
296296
{
297297
if (!lastStatusChangedEvent.Equals(cacheUpdateEvent))
298298
{
299-
new ActionTask(TaskManager.Token, () => {
300-
lastStatusChangedEvent = cacheUpdateEvent;
301-
currentStatusHasUpdate = true;
302-
Redraw();
303-
}) { Affinity = TaskAffinity.UI }.Start();
299+
lastStatusChangedEvent = cacheUpdateEvent;
300+
currentStatusHasUpdate = true;
301+
Redraw();
304302
}
305303
}
306304

307305
private void RepositoryOnLogChanged(CacheUpdateEvent cacheUpdateEvent)
308306
{
309307
if (!lastLogChangedEvent.Equals(cacheUpdateEvent))
310308
{
311-
new ActionTask(TaskManager.Token, () => {
312-
lastLogChangedEvent = cacheUpdateEvent;
313-
currentLogHasUpdate = true;
314-
Redraw();
315-
}) { Affinity = TaskAffinity.UI }.Start();
309+
lastLogChangedEvent = cacheUpdateEvent;
310+
currentLogHasUpdate = true;
311+
Redraw();
316312
}
317313
}
318314

319315
private void RepositoryOnCurrentRemoteChanged(CacheUpdateEvent cacheUpdateEvent)
320316
{
321317
if (!lastCurrentRemoteChangedEvent.Equals(cacheUpdateEvent))
322318
{
323-
new ActionTask(TaskManager.Token, () => {
324-
lastCurrentRemoteChangedEvent = cacheUpdateEvent;
325-
currentRemoteHasUpdate = true;
326-
Redraw();
327-
}) { Affinity = TaskAffinity.UI }.Start();
319+
lastCurrentRemoteChangedEvent = cacheUpdateEvent;
320+
currentRemoteHasUpdate = true;
321+
Redraw();
328322
}
329323
}
330324

‎src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,9 @@ private void UserOnChanged(CacheUpdateEvent cacheUpdateEvent)
9595
{
9696
if (!lastCheckUserChangedEvent.Equals(cacheUpdateEvent))
9797
{
98-
new ActionTask(TaskManager.Token, () =>
99-
{
100-
lastCheckUserChangedEvent = cacheUpdateEvent;
101-
userHasChanges = true;
102-
Redraw();
103-
})
104-
{ Affinity = TaskAffinity.UI }.Start();
98+
lastCheckUserChangedEvent = cacheUpdateEvent;
99+
userHasChanges = true;
100+
Redraw();
105101
}
106102
}
107103

‎src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,28 +45,20 @@ private static void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)
4545
{
4646
if (!lastRepositoryStatusChangedEvent.Equals(cacheUpdateEvent))
4747
{
48-
new ActionTask(CancellationToken.None, () =>
49-
{
50-
lastRepositoryStatusChangedEvent = cacheUpdateEvent;
51-
entries.Clear();
52-
entries.AddRange(repository.CurrentStatus.Entries);
53-
OnStatusUpdate();
54-
})
55-
{ Affinity = TaskAffinity.UI }.Start();
48+
lastRepositoryStatusChangedEvent = cacheUpdateEvent;
49+
entries.Clear();
50+
entries.AddRange(repository.CurrentStatus.Entries);
51+
OnStatusUpdate();
5652
}
5753
}
5854

5955
private static void RepositoryOnLocksChanged(CacheUpdateEvent cacheUpdateEvent)
6056
{
6157
if (!lastLocksChangedEvent.Equals(cacheUpdateEvent))
6258
{
63-
new ActionTask(CancellationToken.None, () =>
64-
{
65-
lastLocksChangedEvent = cacheUpdateEvent;
66-
locks = repository.CurrentLocks;
67-
OnLocksUpdate();
68-
})
69-
{ Affinity = TaskAffinity.UI }.Start();
59+
lastLocksChangedEvent = cacheUpdateEvent;
60+
locks = repository.CurrentLocks;
61+
OnLocksUpdate();
7062
}
7163
}
7264

‎src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,23 +126,19 @@ private void RepositoryOnLocksChanged(CacheUpdateEvent cacheUpdateEvent)
126126
{
127127
if (!lastLocksChangedEvent.Equals(cacheUpdateEvent))
128128
{
129-
new ActionTask(TaskManager.Token, () => {
130-
lastLocksChangedEvent = cacheUpdateEvent;
131-
currentLocksHasUpdate = true;
132-
Redraw();
133-
}) { Affinity = TaskAffinity.UI }.Start();
129+
lastLocksChangedEvent = cacheUpdateEvent;
130+
currentLocksHasUpdate = true;
131+
Redraw();
134132
}
135133
}
136134

137135
private void RepositoryOnCurrentRemoteChanged(CacheUpdateEvent cacheUpdateEvent)
138136
{
139137
if (!lastCurrentRemoteChangedEvent.Equals(cacheUpdateEvent))
140138
{
141-
new ActionTask(TaskManager.Token, () => {
142-
lastCurrentRemoteChangedEvent = cacheUpdateEvent;
143-
currentRemoteHasUpdate = true;
144-
Redraw();
145-
}) { Affinity = TaskAffinity.UI }.Start();
139+
lastCurrentRemoteChangedEvent = cacheUpdateEvent;
140+
currentRemoteHasUpdate = true;
141+
Redraw();
146142
}
147143
}
148144

‎src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ namespace GitHub.Unity
1111
[Serializable]
1212
public class Tree
1313
{
14-
[SerializeField] public float ItemHeight = EditorGUIUtility.singleLineHeight;
15-
[SerializeField] public float ItemSpacing = EditorGUIUtility.standardVerticalSpacing;
16-
[SerializeField] public float Indentation = 12f;
14+
public static float ItemHeight { get { return EditorGUIUtility.singleLineHeight; } }
15+
public static float ItemSpacing { get { return EditorGUIUtility.standardVerticalSpacing; } }
16+
1717
[SerializeField] public Rect Margin = new Rect();
1818
[SerializeField] public Rect Padding = new Rect();
1919

@@ -169,7 +169,7 @@ public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = nul
169169

170170
if (visible)
171171
{
172-
var changed = node.Render(rect, Indentation, selectedNode == node, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
172+
var changed = node.Render(rect, Styles.TreeIndentation, selectedNode == node, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
173173

174174
if (node.IsFolder && changed)
175175
{
@@ -210,20 +210,18 @@ public void Focus()
210210
{
211211
int directionY = Event.current.keyCode == KeyCode.UpArrow ? -1 : Event.current.keyCode == KeyCode.DownArrow ? 1 : 0;
212212
int directionX = Event.current.keyCode == KeyCode.LeftArrow ? -1 : Event.current.keyCode == KeyCode.RightArrow ? 1 : 0;
213-
if (directionY != 0 || directionX != 0)
213+
214+
if (directionY < 0 || directionX < 0)
214215
{
215-
if (directionY < 0 || directionY < 0)
216-
{
217-
SelectedNode = nodes[nodes.Count - 1];
218-
selectionChanged = true;
219-
Event.current.Use();
220-
}
221-
else if (directionY > 0 || directionX > 0)
222-
{
223-
SelectedNode = nodes[0];
224-
selectionChanged = true;
225-
Event.current.Use();
226-
}
216+
SelectedNode = nodes[nodes.Count - 1];
217+
selectionChanged = true;
218+
Event.current.Use();
219+
}
220+
else if (directionY > 0 || directionX > 0)
221+
{
222+
SelectedNode = nodes[0];
223+
selectionChanged = true;
224+
Event.current.Use();
227225
}
228226
}
229227
RequiresRepaint = selectionChanged;
@@ -437,7 +435,7 @@ public bool Render(Rect rect, float indentation, bool isSelected, GUIStyle folde
437435

438436
if (Event.current.type == EventType.repaint)
439437
{
440-
nodeStyle.Draw(fillRect, "", false, false, false, isSelected);
438+
nodeStyle.Draw(fillRect, GUIContent.none, false, false, false, isSelected);
441439
if (IsFolder)
442440
style.Draw(nodeRect, content, false, false, !IsCollapsed, isSelected);
443441
else
@@ -449,7 +447,7 @@ public bool Render(Rect rect, float indentation, bool isSelected, GUIStyle folde
449447
if (IsFolder)
450448
{
451449
EditorGUI.BeginChangeCheck();
452-
GUI.Toggle(nodeRect, !IsCollapsed, "", GUIStyle.none);
450+
GUI.Toggle(nodeRect, !IsCollapsed, GUIContent.none, GUIStyle.none);
453451
changed = EditorGUI.EndChangeCheck();
454452
}
455453

‎src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,10 @@ private void UserOnChanged(CacheUpdateEvent cacheUpdateEvent)
9696

9797
if (!lastCheckUserChangedEvent.Equals(cacheUpdateEvent))
9898
{
99-
new ActionTask(TaskManager.Token, () => {
100-
lastCheckUserChangedEvent = cacheUpdateEvent;
101-
userHasChanges = true;
102-
isBusy = false;
103-
Redraw();
104-
})
105-
{ Affinity = TaskAffinity.UI }.Start();
99+
lastCheckUserChangedEvent = cacheUpdateEvent;
100+
userHasChanges = true;
101+
isBusy = false;
102+
Redraw();
106103
}
107104
}
108105

‎src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,9 @@ private void RepositoryOnCurrentBranchAndRemoteChanged(CacheUpdateEvent cacheUpd
279279
{
280280
if (!lastCurrentBranchAndRemoteChangedEvent.Equals(cacheUpdateEvent))
281281
{
282-
new ActionTask(TaskManager.Token, () =>
283-
{
284-
lastCurrentBranchAndRemoteChangedEvent = cacheUpdateEvent;
285-
currentBranchAndRemoteHasUpdate = true;
286-
Redraw();
287-
})
288-
{ Affinity = TaskAffinity.UI }.Start();
282+
lastCurrentBranchAndRemoteChangedEvent = cacheUpdateEvent;
283+
currentBranchAndRemoteHasUpdate = true;
284+
Redraw();
289285
}
290286
}
291287

0 commit comments

Comments
 (0)