Merge pull request #360 from stylefish/keyTipFix

Toggling of KeyTips should not happen when Shift is pressed
fluentribbon · Oct 18, 2016 · 555306e · 555306e
2 parents 474e316 + 19dd0ff
commit 555306e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Fluent.Ribbon/Services/KeyTipService.cs b/Fluent.Ribbon/Services/KeyTipService.cs
@@ -322,11 +322,11 @@ private void OnWindowKeyUp(object sender, KeyEventArgs e)
 
         private static bool IsShowOrHideKey(KeyEventArgs e)
         {
-            return e.Key == Key.System
-                && (e.SystemKey == Key.LeftAlt
-                   || e.SystemKey == Key.RightAlt
-                   || e.SystemKey == Key.F10
-                   || e.SystemKey == Key.Space);
+            return e.Key == Key.System && !Keyboard.IsKeyDown(Key.LeftShift) && !Keyboard.IsKeyDown(Key.RightShift)
+                   && (e.SystemKey == Key.LeftAlt
+                       || e.SystemKey == Key.RightAlt
+                       || e.SystemKey == Key.F10
+                       || e.SystemKey == Key.Space);
         }
 
         private void ClearUserInput()