Merge branch 'fixes/refactor-tree-view' into enhancements/changes-tree-view

Author: StanleyGoldman

src/GitHub.Api/UI/TreeBase.cs

@@ -20,7 +20,7 @@ public interface ITreeNode
         bool IsHidden { get; set; }
         bool IsActive { get; set; }
         bool TreeIsCheckable { get; set; }
-        CheckState State { get; set; }
+        CheckState CheckState { get; set; }
     }
 
     public abstract class TreeBase<TNode, TData> where TNode : class, ITreeNode where TData : struct, ITreeData
@@ -164,16 +164,16 @@ protected void ToggleNodeChecked(int idx, TNode node)
         {
             var isChecked = false;
 
-            switch (node.State)
+            switch (node.CheckState)
             {
                 case CheckState.Mixed:
                 case CheckState.Empty:
-                    node.State = CheckState.Checked;
+                    node.CheckState = CheckState.Checked;
                     isChecked = true;
                     break;
 
                 case CheckState.Checked:
-                    node.State = CheckState.Empty;
+                    node.CheckState = CheckState.Empty;
                     break;
             }
 
@@ -201,8 +201,8 @@ private void ToggleChildrenChecked(int idx, TNode node, bool isChecked)
             for (var i = idx + 1; i < Nodes.Count && node.Level < Nodes[i].Level; i++)
             {
                 var childNode = Nodes[i];
-                var wasChecked = childNode.State == CheckState.Checked;
-                childNode.State = isChecked ? CheckState.Checked : CheckState.Empty;
+                var wasChecked = childNode.CheckState == CheckState.Checked;
+                childNode.CheckState = isChecked ? CheckState.Checked : CheckState.Empty;
 
                 if (childNode.IsFolder)
                 {
@@ -243,7 +243,7 @@ private void ToggleParentFoldersChecked(int idx, TNode node, bool isChecked)
 
                         if (siblingsInSameState)
                         {
-                            var previousNodeIsChecked = previousNode.State == CheckState.Checked;
+                            var previousNodeIsChecked = previousNode.CheckState == CheckState.Checked;
 
                             if (isChecked != previousNodeIsChecked)
                             {
@@ -262,7 +262,7 @@ private void ToggleParentFoldersChecked(int idx, TNode node, bool isChecked)
                                 continue;
                             }
 
-                            var followingNodeIsChecked = followingNode.State == CheckState.Checked;
+                            var followingNodeIsChecked = followingNode.CheckState == CheckState.Checked;
                             if (isChecked != followingNodeIsChecked)
                             {
                                 siblingsInSameState = false;
@@ -275,11 +275,11 @@ private void ToggleParentFoldersChecked(int idx, TNode node, bool isChecked)
                     var parentNode = Nodes[parentIndex];
                     if (siblingsInSameState)
                     {
-                        parentNode.State = isChecked ? CheckState.Checked : CheckState.Empty;
+                        parentNode.CheckState = isChecked ? CheckState.Checked : CheckState.Empty;
                     }
                     else
                     {
-                        parentNode.State = CheckState.Mixed;
+                        parentNode.CheckState = CheckState.Mixed;
                     }
 
                     idx = parentIndex;

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

@@ -132,7 +132,7 @@ protected override IEnumerable<string> GetCollapsedFolders()
 
         public override IEnumerable<string> GetCheckedFiles()
         {
-            return checkedFileNodes.Where(pair => pair.Value.State == CheckState.Checked).Select(pair => pair.Key);
+            return checkedFileNodes.Where(pair => pair.Value.CheckState == CheckState.Checked).Select(pair => pair.Key);
         }
 
         protected override void RemoveCheckedNode(ChangesTreeNode node)

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

@@ -419,7 +419,7 @@ public bool TreeIsCheckable
             set { treeIsCheckable = value; }
         }
 
-        public CheckState State
+        public CheckState CheckState
         {
             get { return checkState; }
             set { checkState = value; }
@@ -484,11 +484,11 @@ public TreeNodeRenderResult Render(Rect rect, float indentation, bool isSelected
                 var selectionStyle = GUI.skin.toggle;
                 var selectionValue = false;
 
-                if (State == CheckState.Checked)
+                if (CheckState == CheckState.Checked)
                 {
                     selectionValue = true;
                 }
-                else if (State == CheckState.Mixed)
+                else if (CheckState == CheckState.Mixed)
                 {
                     selectionStyle = Styles.ToggleMixedStyle;
                 }
@@ -618,7 +618,7 @@ protected override IEnumerable<string> GetCollapsedFolders()
 
         public override IEnumerable<string> GetCheckedFiles()
         {
-            return checkedFileNodes.Where(pair => pair.Value.State == CheckState.Checked).Select(pair => pair.Key);
+            return checkedFileNodes.Where(pair => pair.Value.CheckState == CheckState.Checked).Select(pair => pair.Key);
         }
 
         protected override void RemoveCheckedNode(TreeNode node)