Merge pull request AvaloniaUI#7440 from emmauss/diagnostic-key

maxkatz6 · danwalmsley · commit 3f11b014a616 · 2022-02-21T21:33:11.000Z
Ensure Control Inspection in Diagnostics tool window is triggered on Key Down
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
@@ -163,7 +163,9 @@ private void RawKeyDown(RawKeyEventArgs e)
 
             switch (e.Modifiers)
             {
-                case RawInputModifiers.Control | RawInputModifiers.Shift:
+                case RawInputModifiers.Control when (e.Key == Key.LeftShift || e.Key == Key.RightShift):
+                case RawInputModifiers.Shift when (e.Key == Key.LeftCtrl || e.Key == Key.RightCtrl):
+                case RawInputModifiers.Shift | RawInputModifiers.Control:
                 {
                     IControl? control = null;
 

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,9 @@ private void RawKeyDown(RawKeyEventArgs e)`
`163`	`163`
`164`	`164`	`switch (e.Modifiers)`
`165`	`165`	`{`
`166`		`- case RawInputModifiers.Control \| RawInputModifiers.Shift:`
	`166`	`+ case RawInputModifiers.Control when (e.Key == Key.LeftShift \|\| e.Key == Key.RightShift):`
	`167`	`+ case RawInputModifiers.Shift when (e.Key == Key.LeftCtrl \|\| e.Key == Key.RightCtrl):`
	`168`	`+ case RawInputModifiers.Shift \| RawInputModifiers.Control:`
`167`	`169`	`{`
`168`	`170`	`IControl? control = null;`
`169`	`171`