Skip to content

Fixed KeyTrigger modifier keys #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2023
Merged

Fixed KeyTrigger modifier keys #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion Test/UnitTests/KeyTriggerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,13 @@ public void Teardown()
[DataRow(Key.NumPad9)]
[DataRow(Key.Enter)]
[DataRow(Key.Tab)]
[DataRow(Key.LeftCtrl)]
[DataRow(Key.RightCtrl)]
[DataRow(Key.LeftAlt)]
[DataRow(Key.RightAlt)]
[DataRow(Key.System)]
[DataRow(Key.LeftShift)]
[DataRow(Key.RightShift)]
public void KeyTrigger_InvokesActions_WhenKeyIsPressed(Key key)
{
var textBox = new TextBox();
Expand Down Expand Up @@ -127,6 +134,13 @@ public void KeyTrigger_InvokesActions_WhenKeyIsPressed(Key key)
[DataRow(Key.NumPad9)]
[DataRow(Key.Enter)]
[DataRow(Key.Tab)]
[DataRow(Key.LeftCtrl)]
[DataRow(Key.RightCtrl)]
[DataRow(Key.LeftAlt)]
[DataRow(Key.RightAlt)]
[DataRow(Key.System)]
[DataRow(Key.LeftShift)]
[DataRow(Key.RightShift)]
public void KeyTrigger_InvokesActions_WhenKeyIsReleased(Key key)
{
var textBox = new TextBox();
Expand All @@ -148,7 +162,6 @@ public void KeyTrigger_InvokesActions_WhenKeyIsReleased(Key key)
}
}


[TestMethod]
[DataRow(true)]
[DataRow(false)]
Expand Down
6 changes: 4 additions & 2 deletions src/Microsoft.Xaml.Behaviors/Input/KeyTrigger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,10 @@ protected override string GetEventName()

private void OnKeyPress(object sender, KeyEventArgs e)
{
if (e.Key == this.Key &&
Keyboard.Modifiers == GetActualModifiers(e.Key, this.Modifiers))
bool isKeyMatch = e.Key == this.Key;
bool isModifiersMatch = this.Modifiers == ModifierKeys.None ? true : Keyboard.Modifiers == GetActualModifiers(e.Key, this.Modifiers);

if (isKeyMatch && isModifiersMatch)
{
this.InvokeActions(e);
}
Expand Down