Merge branch 'enhancements/tree-view-checked-state' into enhancements/changes-tree-view

StanleyGoldman · StanleyGoldman · commit 7967fbdcd1c2 · 2017-12-06T17:25:26.000-05:00
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs
@@ -294,14 +294,9 @@ private void ToggleNodeChecked(int idx, TreeNode node)
 
         private void ToggleChildrenChecked(int idx, TreeNode node, bool isChecked)
         {
-            for (var i = idx + 1; i < nodes.Count && node.Level <= nodes[i].Level; i++)
+            for (var i = idx + 1; i < nodes.Count && node.Level < nodes[i].Level; i++)
             {
                 var childNode = nodes[i];
-                if (node.Level == childNode.Level)
-                {
-                    continue;
-                }
-
                 childNode.CheckState = isChecked ? CheckState.Checked : CheckState.Empty;
 
                 if (childNode.IsFolder)

Original file line number	Diff line number	Diff line change
`@@ -294,14 +294,9 @@ private void ToggleNodeChecked(int idx, TreeNode node)`
`294`	`294`
`295`	`295`	`private void ToggleChildrenChecked(int idx, TreeNode node, bool isChecked)`
`296`	`296`	`{`
`297`		`- for (var i = idx + 1; i < nodes.Count && node.Level <= nodes[i].Level; i++)`
	`297`	`+ for (var i = idx + 1; i < nodes.Count && node.Level < nodes[i].Level; i++)`
`298`	`298`	`{`
`299`	`299`	`var childNode = nodes[i];`
`300`		`- if (node.Level == childNode.Level)`
`301`		`- {`
`302`		`- continue;`
`303`		`- }`
`304`		`-`
`305`	`300`	`childNode.CheckState = isChecked ? CheckState.Checked : CheckState.Empty;`
`306`	`301`
`307`	`302`	`if (childNode.IsFolder)`