mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 14:32:35 +01:00
Use same logic for numpad subtract/add/divide/multiply as for single letter letters/digits - thx
pandalamp :) Work on #7717
This commit is contained in:
parent
4b818b1457
commit
1c7945abc2
@ -16625,7 +16625,14 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
// do not check for shortcuts if text is being entered and a textbox is focused
|
||||
var textBoxTypes = new List<string> { "AdvancedTextBox", "SimpleTextBox", "SETextBox", "TextBox", "RichTextBox" };
|
||||
if (textBoxTypes.Contains(typeName) &&
|
||||
((e.KeyCode >= Keys.A && e.KeyCode <= Keys.Z) || (e.KeyCode >= Keys.OemSemicolon && e.KeyCode <= Keys.OemBackslash) || e.KeyCode >= Keys.NumPad0 && e.KeyCode <= Keys.NumPad9 || e.KeyValue >= 48 && e.KeyValue <= 57) &&
|
||||
((e.KeyCode >= Keys.A && e.KeyCode <= Keys.Z) ||
|
||||
(e.KeyCode >= Keys.OemSemicolon && e.KeyCode <= Keys.OemBackslash) ||
|
||||
e.KeyCode >= Keys.NumPad0 && e.KeyCode <= Keys.NumPad9 ||
|
||||
e.KeyCode == Keys.Multiply ||
|
||||
e.KeyCode == Keys.Add ||
|
||||
e.KeyCode == Keys.Subtract ||
|
||||
e.KeyCode == Keys.Divide ||
|
||||
e.KeyValue >= 48 && e.KeyValue <= 57) &&
|
||||
!Configuration.Settings.General.AllowLetterShortcutsInTextBox)
|
||||
{
|
||||
return;
|
||||
|
@ -1558,7 +1558,7 @@ namespace Nikse.SubtitleEdit.Forms.Options
|
||||
AddNode(generalNode, language.DuplicateLine, nameof(Configuration.Settings.Shortcuts.GeneralDuplicateLine));
|
||||
AddNode(generalNode, language.OpenDataFolder, nameof(Configuration.Settings.Shortcuts.OpenDataFolder));
|
||||
AddNode(generalNode, LanguageSettings.Current.Main.Menu.File.OpenContainingFolder, nameof(Configuration.Settings.Shortcuts.OpenContainingFolder), true);
|
||||
AddNode(generalNode, language.ToggleView, nameof(Configuration.Settings.Shortcuts.GeneralToggleView));
|
||||
AddNode(generalNode, language.ToggleView, nameof(Configuration.Settings.Shortcuts.GeneralToggleView), true);
|
||||
AddNode(generalNode, language.ToggleMode, nameof(Configuration.Settings.Shortcuts.GeneralToggleMode));
|
||||
AddNode(generalNode, language.TogglePreviewOnVideo, nameof(Configuration.Settings.Shortcuts.GeneralTogglePreviewOnVideo));
|
||||
AddNode(generalNode, language.RemoveBlankLines, nameof(Configuration.Settings.Shortcuts.GeneralRemoveBlankLines));
|
||||
|
Loading…
Reference in New Issue
Block a user