Merge branch 'files-community:main' into nupkg

Lamparter · web-flow · commit a8c77e839a1b · 2024-12-17T08:24:53.000Z
diff --git a/src/Files.App/Helpers/MenuFlyout/ContextFlyoutModelToElementHelper.cs b/src/Files.App/Helpers/MenuFlyout/ContextFlyoutModelToElementHelper.cs
@@ -295,6 +295,8 @@ private static ICommandBarElement GetCommandBarButton(ContextMenuFlyoutItemViewM
 					{
 						button.KeyboardAccelerators.Add(item.KeyboardAccelerator);
 						button.KeyboardAcceleratorTextOverride = item.KeyboardAcceleratorTextOverride;
+						// Fixes #16193: VirtualKey does not support OEM keys (e.g "�")
+						button.KeyboardAcceleratorPlacementMode = Microsoft.UI.Xaml.Input.KeyboardAcceleratorPlacementMode.Hidden;
 					}
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -295,6 +295,8 @@ private static ICommandBarElement GetCommandBarButton(ContextMenuFlyoutItemViewM`
`295`	`295`	`{`
`296`	`296`	`button.KeyboardAccelerators.Add(item.KeyboardAccelerator);`
`297`	`297`	`button.KeyboardAcceleratorTextOverride = item.KeyboardAcceleratorTextOverride;`
	`298`	`+ // Fixes #16193: VirtualKey does not support OEM keys (e.g "ò")`
	`299`	`+ button.KeyboardAcceleratorPlacementMode = Microsoft.UI.Xaml.Input.KeyboardAcceleratorPlacementMode.Hidden;`
`298`	`300`	`}`
`299`	`301`	`}`
`300`	`302`	`}`