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

Commit 1fc7a8a

Browse files
Some code cleanup
1 parent ac619e1 commit 1fc7a8a

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,14 @@ private void UpdateTreeIcons()
185185

186186
private void UpdateTreeStyles()
187187
{
188-
if (treeLocals != null && treeLocals.FolderStyle == null)
188+
if (treeLocals.FolderStyle == null)
189189
{
190190
treeLocals.FolderStyle = Styles.Foldout;
191191
treeLocals.TreeNodeStyle = Styles.TreeNode;
192192
treeLocals.ActiveTreeNodeStyle = Styles.TreeNodeActive;
193193
}
194194

195-
if (treeRemotes != null && treeRemotes.FolderStyle == null)
195+
if (treeRemotes.FolderStyle == null)
196196
{
197197
treeRemotes.FolderStyle = Styles.Foldout;
198198
treeRemotes.TreeNodeStyle = Styles.TreeNode;

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public override void OnDisable()
4949
public override void OnDataUpdate()
5050
{
5151
base.OnDataUpdate();
52-
5352
MaybeUpdateData();
5453
}
5554

@@ -101,15 +100,9 @@ public override void OnGUI()
101100

102101
private void OnTreeGUI(Rect rect)
103102
{
104-
var initialRect = rect;
105-
106-
if (treeChanges.FolderStyle == null)
107-
{
108-
treeChanges.FolderStyle = Styles.Foldout;
109-
treeChanges.TreeNodeStyle = Styles.TreeNode;
110-
treeChanges.ActiveTreeNodeStyle = Styles.TreeNodeActive;
111-
}
103+
UpdateTreeStyles();
112104

105+
var initialRect = rect;
113106
rect = treeChanges.Render(initialRect, rect, scroll,
114107
node => { },
115108
node => {
@@ -123,6 +116,16 @@ private void OnTreeGUI(Rect rect)
123116
GUILayout.Space(rect.y - initialRect.y);
124117
}
125118

119+
private void UpdateTreeStyles()
120+
{
121+
if (treeChanges.FolderStyle == null)
122+
{
123+
treeChanges.FolderStyle = Styles.Foldout;
124+
treeChanges.TreeNodeStyle = Styles.TreeNode;
125+
treeChanges.ActiveTreeNodeStyle = Styles.TreeNodeActive;
126+
}
127+
}
128+
126129
private void RepositoryOnStatusEntriesChanged(CacheUpdateEvent cacheUpdateEvent)
127130
{
128131
if (!lastStatusEntriesChangedEvent.Equals(cacheUpdateEvent))

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace GitHub.Unity
1111
[Serializable]
1212
public class TreeNodeDictionary : SerializableDictionary<string, TreeNode> { }
1313

14-
1514
[Serializable]
1615
public abstract class Tree: ITree
1716
{

0 commit comments

Comments
 (0)