Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 03:02:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8089 from ivandrofly/issues/nagivation-combo-7958

Browse Source 
Fixes #7958
This commit is contained in:
Nikolaj Olsson 2024-03-28 19:56:53 +01:00 committed by GitHub
commit 851a668645
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/ui/Controls/NikseComboBox.cs
View File

@ -424,6 +424,30 @@ namespace Nikse.SubtitleEdit.Controls
return base.IsInputKey(keyData);
}
private void NavigateUp() => Navigate(_selectedIndex - 1);
private void NavigateDown() => Navigate(_selectedIndex + 1);
private void Navigate(int index)
{
if (index < 0 || index >= _items.Count)
{
return;
}
_selectedIndex = index;
_textBox.Text = Items[_selectedIndex].ToString();
if (!_skipPaint)
{
Invalidate();
}
_textBox.SelectionStart = 0;
_textBox.SelectionLength = _textBox.Text.Length;
NotifyTextChanged();
}
public NikseComboBox()
{
_loading = true;
@ -560,48 +584,15 @@ namespace Nikse.SubtitleEdit.Controls
_textBox.KeyDown += (sender, e) =>
{
if (DropDownStyle != ComboBoxStyle.DropDown)
if (e.KeyCode == Keys.Up)
{
if (e.KeyCode == Keys.Up)
{
if (_selectedIndex > 0)
{
_selectedIndex--;
_textBox.Text = Items[_selectedIndex].ToString();
Invalidate();
if (!_loading)
{
SelectedIndexChanged?.Invoke(sender, e);
SelectedValueChanged?.Invoke(this, EventArgs.Empty);
TextChanged?.Invoke(this, EventArgs.Empty);
}
}
e.Handled = true;
}
else if (e.KeyCode == Keys.Down)
{
if (_selectedIndex < Items.Count - 1)
{
_selectedIndex++;
_textBox.Text = Items[_selectedIndex].ToString();
if (!_loading)
{
SelectedIndexChanged?.Invoke(sender, e);
SelectedValueChanged?.Invoke(this, EventArgs.Empty);
TextChanged?.Invoke(this, EventArgs.Empty);
}
if (!_skipPaint)
{
Invalidate();
}
}
e.Handled = true;
}
else
{
KeyDown?.Invoke(this, e);
}
NavigateUp();
e.Handled = true;
}
else if (e.KeyCode == Keys.Down)
{
NavigateDown();
e.Handled = true;
}
else
{
@ -1344,7 +1335,7 @@ namespace Nikse.SubtitleEdit.Controls
{
_owner = owner;
}
protected override void WndProc(ref Message m)
{
if (m.Msg == 0x0204) // WM_RBUTTONDOWN
@ -1358,7 +1349,6 @@ namespace Nikse.SubtitleEdit.Controls
base.WndProc(ref m);
}
}
}
}
}