[FancyZones] Focus layout type instead of activating it on enter press (

#12823)
microsoft · Aug 23, 2021 · cea9b35 · cea9b35
1 parent ea25bd9
commit cea9b35
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
@@ -42,6 +42,20 @@ public MainWindow(bool spanZonesAcrossMonitors, Rect workArea)
 
             KeyUp += MainWindow_KeyUp;
 
+            // Prevent closing the dialog with enter
+            PreviewKeyDown += (object sender, KeyEventArgs e) =>
+            {
+                if (e.Key == Key.Enter && _openedDialog != null && _openedDialog.IsVisible)
+                {
+                    var source = e.OriginalSource as RadioButton;
+                    if (source != null && source.IsChecked != true)
+                    {
+                        source.IsChecked = true;
+                        e.Handled = true;
+                    }
+                }
+            };
+
             if (spanZonesAcrossMonitors)
             {
                 WindowStartupLocation = WindowStartupLocation.CenterScreen;