[ComboBox] Ensure popup gets closed when form is moved.

modern-forms · Jul 22, 2023 · 77ff148 · 77ff148
1 parent 20a1f06
commit 77ff148
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/src/Modern.Forms/Application.cs b/src/Modern.Forms/Application.cs
@@ -17,10 +17,23 @@ public static class Application
 
         /// <summary>
         /// This is the top level active menu, if any.
-        /// This is used to hide menus if the user clicks elsewhere on the Form or off the Form.
         /// </summary>
         internal static MenuBase? ActiveMenu { get; set; }
 
+        /// <summary>
+        /// This is the open popup window, like the ComboBox dropdown, if any.
+        /// </summary>
+        internal static PopupWindow? ActivePopupWindow { get; set; }
+
+        /// <summary>
+        /// Hides any open popups.
+        /// </summary>
+        internal static void ClosePopups ()
+        {
+            ActiveMenu?.Deactivate ();
+            ActivePopupWindow?.Hide ();
+        }
+
         /// <summary>
         /// Exits the application.
         /// </summary>

diff --git a/src/Modern.Forms/ComboBox.cs b/src/Modern.Forms/ComboBox.cs
@@ -79,6 +79,9 @@ public bool DroppedDown {
                     };
 
                     popup.Controls.Add (popup_listbox);
+
+                    Application.ActivePopupWindow = popup;
+
                     popup.Show (this, 1, Height);
 
                     OnDropDownOpened (EventArgs.Empty);

diff --git a/src/Modern.Forms/Control.cs b/src/Modern.Forms/Control.cs
@@ -1407,8 +1407,8 @@ internal void RaiseMouseDown (MouseEventArgs e)
             else {
                 // If we're clicking on the a Control that isn't the active menu, 
                 // we need to close the active menu (if any)
-                if ((this as MenuBase)?.GetTopLevelMenu () != Application.ActiveMenu)
-                    Application.ActiveMenu?.Deactivate ();
+                if ((this as MenuBase)?.GetTopLevelMenu () != Application.ActiveMenu || Application.ActiveMenu is null)
+                    Application.ClosePopups ();
 
                 if (Enabled) {
                     Select ();

diff --git a/src/Modern.Forms/MenuDropDown.cs b/src/Modern.Forms/MenuDropDown.cs
@@ -92,7 +92,7 @@ protected override void OnClick (MouseEventArgs e)
             if (clicked_item != null && !clicked_item.HasItems) {
 
                 if (!clicked_item.HasItems) {
-                    Application.ActiveMenu?.Deactivate ();
+                    Application.ClosePopups ();
 
                     clicked_item.OnClick (e);
                     OnItemClicked (e, clicked_item);

diff --git a/src/Modern.Forms/WindowBase.cs b/src/Modern.Forms/WindowBase.cs
@@ -42,7 +42,7 @@ internal WindowBase (IWindowBaseImpl window)
             window.Closed = () => Closed?.Invoke (this, EventArgs.Empty);
             window.Deactivated = () => {
                 // If we're clicking off the form, deactivate any active menus
-                Application.ActiveMenu?.Deactivate ();
+                Application.ClosePopups ();
                 Deactivated?.Invoke (this, EventArgs.Empty);
             };
         }
@@ -145,6 +145,10 @@ public void Hide ()
         {
             Visible = false;
             window.Hide ();
+
+            if (Application.ActivePopupWindow == this)
+                Application.ActivePopupWindow = null;
+
             OnVisibleChanged (EventArgs.Empty);
         }