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

Commit 5704e7b

Browse files
Merge branch 'enhancements/changes-tree-view' into fixes/changes-view-tree-focus
# Conflicts: # src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs
2 parents bccabdf + b65fc78 commit 5704e7b

File tree

2 files changed

+0
-37
lines changed

2 files changed

+0
-37
lines changed

src/GitHub.Api/Git/TreeData.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ public GitBranchTreeData(GitBranch gitBranch)
2222

2323
public string Path => GitBranch.Name;
2424
public bool IsActive => GitBranch.IsActive;
25-
26-
public string CustomStringTag => null;
27-
28-
public int CustomIntTag => 0;
2925
}
3026

3127
[Serializable]
@@ -44,8 +40,6 @@ public GitStatusEntryTreeData(GitStatusEntry gitStatusEntry)
4440
public bool IsActive => false;
4541
public GitStatusEntry GitStatusEntry => gitStatusEntry;
4642

47-
public string ProjectPath => gitStatusEntry.ProjectPath;
48-
4943
public GitFileStatus FileStatus => gitStatusEntry.Status;
5044
}
5145
}

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

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -386,12 +386,6 @@ public class TreeNode : ITreeNode
386386
[NonSerialized] public Texture Icon;
387387
[NonSerialized] public Texture IconBadge;
388388

389-
// [NonSerialized] private GUIStyle blackStyle;
390-
// [NonSerialized] private GUIStyle greenStyle;
391-
// [NonSerialized] private GUIStyle blueStyle;
392-
// [NonSerialized] private GUIStyle yellowStyle;
393-
// [NonSerialized] private GUIStyle magentaStyle;
394-
395389
public string Path
396390
{
397391
get { return path; }
@@ -484,31 +478,6 @@ public TreeNodeRenderResult Render(Rect rect, float indentation, bool isSelected
484478
var iconRect = new Rect(nodeStartX, nodeRect.y, fillRect.width - nodeStartX, nodeRect.height);
485479
var statusRect = new Rect(iconRect.x + 6, iconRect.yMax - 9, 9, 9);
486480

487-
//if (Event.current.type == EventType.repaint)
488-
//{
489-
// if (blackStyle == null)
490-
// blackStyle = new GUIStyle { normal = { background = Utility.GetTextureFromColor(Color.black) } };
491-
//
492-
// if (greenStyle == null)
493-
// greenStyle = new GUIStyle { normal = { background = Utility.GetTextureFromColor(Color.green) } };
494-
//
495-
// if (blueStyle == null)
496-
// blueStyle = new GUIStyle { normal = { background = Utility.GetTextureFromColor(Color.blue) } };
497-
//
498-
// if (yellowStyle == null)
499-
// yellowStyle = new GUIStyle { normal = { background = Utility.GetTextureFromColor(Color.yellow) } };
500-
//
501-
// if (magentaStyle == null)
502-
// magentaStyle = new GUIStyle { normal = { background = Utility.GetTextureFromColor(Color.magenta) } };
503-
//
504-
// GUI.Box(nodeRect, GUIContent.none, blackStyle);
505-
//
506-
// GUI.Box(toggleRect, GUIContent.none, isFolder ? greenStyle : blueStyle);
507-
//
508-
// GUI.Box(checkRect, GUIContent.none, yellowStyle);
509-
// GUI.Box(iconRect, GUIContent.none, magentaStyle);
510-
//}
511-
512481
var contentStyle = IsActive ? activeNodeStyle : nodeStyle;
513482

514483
if (Event.current.type == EventType.repaint)

0 commit comments

Comments
 (0)