changed keyboard selectslide behavior, enter and highlighting is no more needed

This commit is contained in:
Alexander Eckart committed 2012-06-23 16:40:12 +02:00
1 parent 73f7a64835
commit 217e73911e
2 files changed
+14 -10

No files matched your search

+13 -9
View File
@@ -748,27 +748,28 @@ namespace Vocaluxe.Menu
public virtual bool HandleInput(KeyEvent KeyEvent) public virtual bool HandleInput(KeyEvent KeyEvent)
{ {
if (!CSettings.TabNavigation) if (!CSettings.TabNavigation)
{
if (!_IsHighlighted())
_NextInteraction(KeyEvent);
else
{ {
if (KeyEvent.Key == Keys.Left) if (KeyEvent.Key == Keys.Left)
{
if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.TSelectSlide && KeyEvent.Mod != Modifier.Shift)
PrevElement(); PrevElement();
else
_NextInteraction(KeyEvent);
}
if (KeyEvent.Key == Keys.Right) if (KeyEvent.Key == Keys.Right)
{
if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.TSelectSlide && KeyEvent.Mod != Modifier.Shift)
NextElement(); NextElement();
else
_NextInteraction(KeyEvent);
}
if (KeyEvent.Key == Keys.Up || KeyEvent.Key == Keys.Down) if (KeyEvent.Key == Keys.Up || KeyEvent.Key == Keys.Down)
{ {
_ToggleHighlighted();
_NextInteraction(KeyEvent); _NextInteraction(KeyEvent);
} }
} }
if (KeyEvent.Key == Keys.Enter)
_ToggleHighlighted();
}
else else
{ {
if (KeyEvent.Key == Keys.Tab) if (KeyEvent.Key == Keys.Tab)
@@ -1401,9 +1402,12 @@ namespace Vocaluxe.Menu
// select the new element // select the new element
if (Directions[direction].Key == Key.Key) if (Directions[direction].Key == Key.Key)
{ {
_UnsetHighlighted(_Selection);
_UnsetSelected(); _UnsetSelected();
_Selection = element; _Selection = element;
_SetSelected(); _SetSelected();
_SetHighlighted(_Selection);
} }
} }
} }
+1 -1
View File
@@ -302,7 +302,7 @@ namespace Vocaluxe.Screens
CGraphics.FadeTo(EScreens.ScreenSong); CGraphics.FadeTo(EScreens.ScreenSong);
} }
if (!processed && Buttons[htButtons(ButtonStart)].Selected) if (!processed /* && Buttons[htButtons(ButtonStart)].Selected */)
{ {
processed = true; processed = true;
StartSong(); StartSong();