Fixes #688 by adding new Popup-Dismiss-Reason for KeyTips

fluentribbon · Jan 25, 2019 · 3a5e98c · 3a5e98c
1 parent abd0848
commit 3a5e98c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -116,6 +116,7 @@
   - [#666](../../issues/666) - InRibbonGallery DropDown not layouting correctly
   - [#673](../../issues/673) - RibbonContextualTabGroup not shown
   - [#677](../../issues/677) - Alt Codes no longer working in alpha version v7.0.0
+  - [#688](../../issues/688) - Backstage and StartScreen closing when pressing Alt
 
 - ### Enhancements/Features
   - [#516](../../issues/516) - Add options to hide the row containing RibbonTabItems  

diff --git a/Fluent.Ribbon/Controls/Backstage.cs b/Fluent.Ribbon/Controls/Backstage.cs
@@ -266,8 +266,10 @@ private void Handle_DataContextChanged(object sender, DependencyPropertyChangedE
         /// </summary>
         protected virtual void OnDismissPopup(object sender, DismissPopupEventArgs e)
         {
-            // don't close on dismiss popup event if application lost focus
-            if (e.DismissReason == DismissPopupReason.ApplicationLostFocus)
+            // Don't close on dismiss popup event if application lost focus
+            // or keytips should be shown.
+            if (e.DismissReason == DismissPopupReason.ApplicationLostFocus
+                || e.DismissReason == DismissPopupReason.ShowingKeyTips)
             {
                 return;
             }

diff --git a/Fluent.Ribbon/Services/KeyTipService.cs b/Fluent.Ribbon/Services/KeyTipService.cs
@@ -379,7 +379,7 @@ private void ClearUserInput()
 
         private void ClosePopups()
         {
-            PopupService.RaiseDismissPopupEvent(Keyboard.FocusedElement, DismissPopupMode.Always);
+            PopupService.RaiseDismissPopupEvent(Keyboard.FocusedElement, DismissPopupMode.Always, DismissPopupReason.ShowingKeyTips);
         }
 
         private void RestoreFocus()

diff --git a/Fluent.Ribbon/Services/PopupService.cs b/Fluent.Ribbon/Services/PopupService.cs
@@ -39,7 +39,12 @@ public enum DismissPopupReason
         /// <summary>
         /// Application lost focus.
         /// </summary>
-        ApplicationLostFocus
+        ApplicationLostFocus,
+
+        /// <summary>
+        /// Showing key tips.
+        /// </summary>
+        ShowingKeyTips
     }
 
     /// <summary>