Merge pull request #1048 from MuhammadSulaiman001/control-dropdown-po…

…pup-dismissing DismissOnClickOutside property added to DropDownButton
fluentribbon · Aug 25, 2022 · e90986e · e90986e
2 parents 39f1f4c + 2815fe6
commit e90986e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/Fluent.Ribbon/Controls/DropDownButton.cs b/Fluent.Ribbon/Controls/DropDownButton.cs
@@ -107,6 +107,25 @@ public string? KeyTip
     /// <inheritdoc />
     public bool IsContextMenuOpened { get; set; }
 
+    #region DismissOnClickOutside
+
+    /// <summary>
+    /// If false: popup will not be dismissed if a mouse click occurred outside the DropDownButon's borders. <para></para>
+    /// <see cref="IsDropDownOpen"/> and <see cref="ClosePopupOnMouseDown"/> will not be affected by this value.<para/>
+    /// Default value is True.
+    /// </summary>
+    public bool DismissOnClickOutside
+    {
+        get => (bool)this.GetValue(DismissOnClickOutsideProperty);
+        set => this.SetValue(DismissOnClickOutsideProperty, BooleanBoxes.Box(value));
+    }
+
+    /// <summary>Identifies the <see cref="DismissOnClickOutside"/> dependency property.</summary>
+    public static readonly DependencyProperty DismissOnClickOutsideProperty =
+        DependencyProperty.Register(nameof(DismissOnClickOutside), typeof(bool), typeof(DropDownButton), new PropertyMetadata(BooleanBoxes.TrueBox));
+
+    #endregion
+
     #region Header
 
     /// <inheritdoc />

diff --git a/Fluent.Ribbon/Services/PopupService.cs b/Fluent.Ribbon/Services/PopupService.cs
@@ -335,7 +335,8 @@ private static void DismisPopupForAlways(IDropDownControl control, DismissPopupE
 
     private static void DismisPopupForMouseNotOver(IDropDownControl control, DismissPopupEventArgs e)
     {
-        if (control.IsDropDownOpen == false)
+        if (control.IsDropDownOpen == false ||
+            control is DropDownButton { DismissOnClickOutside: false })
         {
             return;
         }