[Control] Don't close popup windows when clicking their child control…

…s. (Fixes #72)
modern-forms · Aug 8, 2023 · a555cc0 · a555cc0
1 parent 504a7bf
commit a555cc0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/Modern.Forms/Application.cs b/src/Modern.Forms/Application.cs
@@ -28,10 +28,13 @@ public static class Application
         /// <summary>
         /// Hides any open popups.
         /// </summary>
-        internal static void ClosePopups ()
+        internal static void ClosePopups (bool closeMenus = true, bool closePopups = true)
         {
-            ActiveMenu?.Deactivate ();
-            ActivePopupWindow?.Hide ();
+            if (closeMenus)
+                ActiveMenu?.Deactivate ();
+
+            if (closePopups)
+                ActivePopupWindow?.Hide ();
         }
 
         /// <summary>

diff --git a/src/Modern.Forms/Control.cs b/src/Modern.Forms/Control.cs
@@ -1405,10 +1405,15 @@ internal void RaiseMouseDown (MouseEventArgs e)
             if (child != null)
                 child.RaiseMouseDown (TranslateMouseEvents (e, child));
             else {
-                // If we're clicking on the a Control that isn't the active menu, 
+                // If we're clicking on 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 is null)
-                    Application.ClosePopups ();
+                    Application.ClosePopups (true, false);
+
+                // If we're clicking on a Control that isn't a child of the active PopupWindow, 
+                // we need to close the active popup (if any)
+                if (FindWindow () != Application.ActivePopupWindow)
+                    Application.ClosePopups (false, true);
 
                 if (Enabled) {
                     Select ();