Some TreeView fixes

rds1983 · Sep 1, 2024 · 13e6bb7 · 13e6bb7
1 parent 88cf89d
commit 13e6bb7
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/src/Myra/Graphics2D/UI/Misc/ITreeViewNode.cs b/src/Myra/Graphics2D/UI/Misc/ITreeViewNode.cs
@@ -0,0 +1,12 @@
+namespace Myra.Graphics2D.UI
+{
+	public interface ITreeViewNode
+	{
+		int ChildNodesCount { get; }
+
+		TreeViewNode AddSubNode(Widget content);
+		TreeViewNode GetSubNode(int index);
+
+		void RemoveAllSubNodes();
+	}
+}
diff --git a/src/Myra/Graphics2D/UI/Misc/TreeView.cs b/src/Myra/Graphics2D/UI/Misc/TreeView.cs
@@ -16,7 +16,7 @@
 
 namespace Myra.Graphics2D.UI
 {
-	public class TreeView : Widget
+	public class TreeView : Widget, ITreeViewNode
 	{
 		private readonly StackPanelLayout _layout = new StackPanelLayout(Orientation.Vertical);
 		private readonly List<TreeViewNode> _allNodes = new List<TreeViewNode>();
@@ -25,6 +25,8 @@ public class TreeView : Widget
 
 		internal List<TreeViewNode> AllNodes => _allNodes;
 
+		public int ChildNodesCount => Children.Count;
+
 		private TreeViewNode HoverRow { get; set; }
 
 		public TreeViewNode SelectedRow
@@ -243,8 +245,11 @@ public TreeViewNode AddSubNode(Widget content)
 			return result;
 		}
 
+		public TreeViewNode GetSubNode(int index) => (TreeViewNode)Children[index];
+
 		public void RemoveAllSubNodes()
 		{
+			Children.Clear();
 			_allNodes.Clear();
 			_selectedRow = null;
 			HoverRow = null;
@@ -413,6 +418,19 @@ public void ApplyTreeViewStyle(TreeStyle style)
 			SelectionHoverBackground = style.SelectionHoverBackground;
 		}
 
+		public TreeViewNode FindNode(Func<TreeViewNode, bool> predicate)
+		{
+			foreach (var node in AllNodes)
+			{
+				if (predicate(node))
+				{
+					return node;
+				}
+			}
+
+			return null;
+		}
+
 		protected internal override void CopyFrom(Widget w)
 		{
 			base.CopyFrom(w);

diff --git a/src/Myra/Graphics2D/UI/Misc/TreeViewNode.cs b/src/Myra/Graphics2D/UI/Misc/TreeViewNode.cs
@@ -11,7 +11,7 @@
 
 namespace Myra.Graphics2D.UI
 {
-	public class TreeViewNode : ContentControl
+	public class TreeViewNode : ContentControl, ITreeViewNode
 	{
 		private readonly GridLayout _layout = new GridLayout();
 		private readonly TreeView _topTree;
@@ -71,7 +71,6 @@ internal TreeViewNode(TreeView topTree, string styleName = Stylesheet.DefaultSty
 			_layout.RowSpacing = 2;
 			ChildrenLayout = _layout;
 
-
 			_topTree = topTree;
 
 			if (_topTree != null)
@@ -157,6 +156,7 @@ public TreeViewNode GetSubNode(int index)
 		public void RemoveSubNode(TreeViewNode subNode)
 		{
 			_childNodesStackPanel.Children.Remove(subNode);
+			_topTree.AllNodes.Remove(subNode);
 			if (_topTree != null && _topTree.SelectedRow == subNode)
 			{
 				_topTree.SelectedRow = null;
@@ -165,8 +165,9 @@ public void RemoveSubNode(TreeViewNode subNode)
 
 		public void RemoveSubNodeAt(int index)
 		{
-			var subNode = _childNodesStackPanel.Children[index];
+			var subNode = (TreeViewNode)_childNodesStackPanel.Children[index];
 			_childNodesStackPanel.Children.RemoveAt(index);
+			_topTree.AllNodes.Remove(subNode);
 			if (_topTree.SelectedRow == subNode)
 			{
 				_topTree.SelectedRow = null;