From 19dd0ff06287985691ae66ac22f6b7ec535cadef Mon Sep 17 00:00:00 2001 From: stylefish Date: Tue, 18 Oct 2016 16:50:52 +0200 Subject: [PATCH] key tips are now not toggled when shift is pressed --- Fluent.Ribbon/Services/KeyTipService.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Fluent.Ribbon/Services/KeyTipService.cs b/Fluent.Ribbon/Services/KeyTipService.cs index 3f5092eef..35e49daab 100644 --- 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()