fixed keyboard navigation in song menu (last row)

This commit is contained in:
Alexander Eckart committed 2012-06-24 13:12:12 +02:00
1 parent 217e73911e
commit c661bc054e
1 file changed
+11 -5
+11 -5
View File
@@ -211,7 +211,9 @@ namespace Vocaluxe.Menu.SongMenu
if (_Locked > 0) if (_Locked > 0)
{ {
_Locked--; _Locked--;
UpdateList((_Locked / _NumW) * _NumW - (_NumW * (_NumH - 2))); if (CSongs.Category < 0 && _Locked < CSongs.NumCategories - _NumW ||
CSongs.Category >= 0 && _Locked < CSongs.NumVisibleSongs - _NumW)
UpdateList((_Locked / _NumW) * _NumW - (_NumW * (_NumH - 2)));
} }
break; break;
@@ -221,7 +223,8 @@ namespace Vocaluxe.Menu.SongMenu
if (_Locked < CSongs.NumCategories - 1) if (_Locked < CSongs.NumCategories - 1)
{ {
_Locked++; _Locked++;
UpdateList((_Locked / _NumW) * _NumW - (_NumW * (_NumH - 2))); if (_Locked < CSongs.NumCategories - _NumW)
UpdateList((_Locked / _NumW) * _NumW - (_NumW * (_NumH - 2)));
} }
} }
@@ -230,7 +233,8 @@ namespace Vocaluxe.Menu.SongMenu
if (_Locked < CSongs.NumVisibleSongs - 1) if (_Locked < CSongs.NumVisibleSongs - 1)
{ {
_Locked++; _Locked++;
UpdateList((_Locked / _NumW) * _NumW - (_NumW * (_NumH - 2))); if (_Locked < CSongs.NumVisibleSongs - _NumW)
UpdateList((_Locked / _NumW) * _NumW - (_NumW * (_NumH - 2)));
} }
} }
break; break;
@@ -261,7 +265,8 @@ namespace Vocaluxe.Menu.SongMenu
if (_Locked < CSongs.NumCategories - _NumW) if (_Locked < CSongs.NumCategories - _NumW)
{ {
_Locked += _NumW; _Locked += _NumW;
UpdateList((_Locked / _NumW) * _NumW - (_NumW * (_NumH - 2))); if (_Locked < CSongs.NumCategories - _NumW)
UpdateList((_Locked / _NumW) * _NumW - (_NumW * (_NumH - 2)));
} }
} }
@@ -270,7 +275,8 @@ namespace Vocaluxe.Menu.SongMenu
if (_Locked < CSongs.NumVisibleSongs - _NumW) if (_Locked < CSongs.NumVisibleSongs - _NumW)
{ {
_Locked += _NumW; _Locked += _NumW;
UpdateList((_Locked / _NumW) * _NumW - (_NumW * (_NumH - 2))); if (_Locked < CSongs.NumVisibleSongs - _NumW)
UpdateList((_Locked / _NumW) * _NumW - (_NumW * (_NumH - 2)));
} }
} }
break; break;