proper fix

4sval · Jan 18, 2022 · 3ad638d · 3ad638d
1 parent a6adddf
commit 3ad638d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs
@@ -11,6 +11,7 @@
 using FModel.ViewModels;
 using FModel.Views;
 using FModel.Views.Resources.Controls;
+using ICSharpCode.AvalonEdit.Editing;
 
 namespace FModel
 {
@@ -84,7 +85,7 @@ private void OnGridSplitterDoubleClick(object sender, MouseButtonEventArgs e)
 
         private void OnWindowKeyDown(object sender, KeyEventArgs e)
         {
-            if (e.OriginalSource is TextBox)
+            if (e.OriginalSource is TextBox || e.OriginalSource is TextArea && Keyboard.Modifiers.HasFlag(ModifierKeys.Control))
                 return;
 
             if (_threadWorkerView.CanBeCanceled && e.Key == Key.Escape)
@@ -106,9 +107,9 @@ private void OnWindowKeyDown(object sender, KeyEventArgs e)
                 _applicationView.CUE4Parse.TabControl.GoLeftTab();
             else if (UserSettings.Default.AssetRightTab.IsTriggered(e.Key))
                 _applicationView.CUE4Parse.TabControl.GoRightTab();
-            else if (UserSettings.Default.DirLeftTab.IsTriggered(e.Key) && !Keyboard.Modifiers.HasFlag(ModifierKeys.Control) && LeftTabControl.SelectedIndex > 0)
+            else if (UserSettings.Default.DirLeftTab.IsTriggered(e.Key) && LeftTabControl.SelectedIndex > 0)
                 LeftTabControl.SelectedIndex--;
-            else if (UserSettings.Default.DirRightTab.IsTriggered(e.Key) && !Keyboard.Modifiers.HasFlag(ModifierKeys.Control) && LeftTabControl.SelectedIndex < LeftTabControl.Items.Count - 1)
+            else if (UserSettings.Default.DirRightTab.IsTriggered(e.Key) && LeftTabControl.SelectedIndex < LeftTabControl.Items.Count - 1)
                 LeftTabControl.SelectedIndex++;
         }