diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs index ce00cfbf..1d483d2c 100644 --- a/FModel/MainWindow.xaml.cs +++ b/FModel/MainWindow.xaml.cs @@ -11,6 +11,7 @@ using FModel.Settings; using FModel.ViewModels; using FModel.Views; using FModel.Views.Resources.Controls; +using ICSharpCode.AvalonEdit.Editing; namespace FModel { @@ -84,7 +85,7 @@ namespace FModel 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 @@ namespace FModel _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++; }