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

Commit 7dce10d

Browse files
Undoing global selection
1 parent 4baadd7 commit 7dce10d

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ public override ChangesTreeNode SelectedNode
9292
set
9393
{
9494
selectedNode = value;
95-
if (value != null && selectionObject)
96-
{
97-
Selection.activeObject = selectionObject;
98-
}
9995
}
10096
}
10197

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

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ namespace GitHub.Unity
99
[Serializable]
1010
public class TreeNodeDictionary : SerializableDictionary<string, TreeNode> { }
1111

12-
public class TreeSelection : ScriptableObject { }
13-
1412
[Serializable]
1513
public abstract class Tree<TNode, TData>: TreeBase<TNode, TData>
1614
where TNode : TreeNode
@@ -30,18 +28,12 @@ public abstract class Tree<TNode, TData>: TreeBase<TNode, TData>
3028
[NonSerialized] private TNode rightClickNextRenderNode;
3129

3230
[NonSerialized] private int controlId;
33-
[NonSerialized] protected TreeSelection selectionObject;
3431

3532
public bool IsInitialized { get { return Nodes != null && Nodes.Count > 0 && !String.IsNullOrEmpty(Nodes[0].Path); } }
3633
public bool RequiresRepaint { get; private set; }
3734

3835
public Rect Render(Rect treeDisplayRect, Vector2 scroll, Action<TNode> singleClick = null, Action<TNode> doubleClick = null, Action<TNode> rightClick = null)
3936
{
40-
if (Selection.activeObject != selectionObject)
41-
{
42-
SelectedNode = null;
43-
}
44-
4537
controlId = GUIUtility.GetControlID(FocusType.Keyboard);
4638
var treeHasFocus = GUIUtility.keyboardControl == controlId;
4739

@@ -333,10 +325,7 @@ protected void LoadNodeIcons()
333325

334326
public void OnEnable()
335327
{
336-
if (!selectionObject)
337-
{
338-
selectionObject = ScriptableObject.CreateInstance<TreeSelection>();
339-
}
328+
340329
}
341330
}
342331

@@ -581,10 +570,6 @@ public override TreeNode SelectedNode
581570
set
582571
{
583572
selectedNode = value;
584-
if (value != null && selectionObject)
585-
{
586-
Selection.activeObject = selectionObject;
587-
}
588573
}
589574
}
590575

0 commit comments

Comments
 (0)