Merge pull request #31 from jdunlap/master

Clearing items in a DarkDropDown does not clear the menu
RobinPerris · Aug 8, 2020 · 3f2b9bc · 3f2b9bc
2 parents 79db58c + be8cbad
commit 3f2b9bc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/DarkUI/Collections/ObservableList.cs b/DarkUI/Collections/ObservableList.cs
@@ -80,6 +80,15 @@ protected virtual void Dispose(bool disposing)
                 ItemsRemoved(this, new ObservableListModified<T>(new List<T> { item }));
         }
 
+        public new void Clear()
+        {
+            ObservableListModified<T> removed = new ObservableListModified<T>(this.ToList<T>());
+            base.Clear();
+
+            if (removed.Items.Count() > 0 && ItemsRemoved != null)
+                ItemsRemoved(this, removed);
+        }
+
         #endregion
     }
 }
diff --git a/DarkUI/Controls/DarkDropdownList.cs b/DarkUI/Controls/DarkDropdownList.cs
@@ -257,6 +257,12 @@ private void Items_CollectionChanged(object sender, NotifyCollectionChangedEvent
                 }
             }
 
+            if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                _menu.Items.Clear();
+                SelectedItem = null;
+            }
+
             ResizeMenu();
         }
 

diff --git a/DarkUI/Controls/DarkTreeView.cs b/DarkUI/Controls/DarkTreeView.cs
@@ -566,16 +566,16 @@ private void UpdateNodes()
             if (IsDragging)
                 return;
 
+            ContentSize = new Size(0, 0);
+
             if (Nodes.Count == 0)
                 return;
 
             var yOffset = 0;
             var isOdd = false;
             var index = 0;
             DarkTreeNode prevNode = null;
-
-            ContentSize = new Size(0, 0);
-
+
             for (var i = 0; i <= Nodes.Count - 1; i++)
             {
                 var node = Nodes[i];