Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/upstream/develop' into gstreamer

Browse Source
This commit is contained in:
Stephan Sundermann committed 2013-02-10 18:05:48 +01:00
2 parents 2be1c021ce 748d9929b5
commit b324c3e600
27 files changed
+358 -471
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/CNameSelection.cs
+18 -19
View File
@@ -360,7 +360,10 @@ namespace Vocaluxe.Menu
break;
}
Selection = VisibleProfiles[_Offset * _Tiles.Count + _actualSelection];
if (_Offset * _Tiles.Count + _actualSelection < VisibleProfiles.Count)
Selection = VisibleProfiles[_Offset * _Tiles.Count + _actualSelection];
else
Selection = -1;
}
public void KeyboardSelection(bool active, int player)
@@ -408,28 +411,24 @@ namespace Vocaluxe.Menu
if (offset < 0)
offset = 0;
if ( _Tiles.Count * (offset + 1) - VisibleProfiles.Count < _Tiles.Count)
for (int i = 0; i < _Tiles.Count; i++)
{
for (int i = 0; i < _Tiles.Count; i++)
if ((i + offset * _Tiles.Count) < VisibleProfiles.Count)
{
if ((i + offset * _Tiles.Count) < VisibleProfiles.Count)
{
_Tiles[i].Avatar.Texture = _Base.Profiles.GetProfiles()[VisibleProfiles[i + offset * _Tiles.Count]].Avatar.Texture;
_Tiles[i].Avatar.Color = new SColorF(1, 1, 1, 1);
_Tiles[i].Name.Text = _Base.Profiles.GetProfiles()[VisibleProfiles[i + offset * _Tiles.Count]].PlayerName;
_Tiles[i].PlayerNr = VisibleProfiles[i + offset * _Tiles.Count];
}
else
{
_Tiles[i].Avatar.Texture = _TextureEmptyTile;
_Tiles[i].Avatar.Color = ColorEmptyTile;
_Tiles[i].Name.Text = "";
_Tiles[i].PlayerNr = -1;
}
_Tiles[i].Avatar.Texture = _Base.Profiles.GetProfiles()[VisibleProfiles[i + offset * _Tiles.Count]].Avatar.Texture;
_Tiles[i].Avatar.Color = new SColorF(1, 1, 1, 1);
_Tiles[i].Name.Text = _Base.Profiles.GetProfiles()[VisibleProfiles[i + offset * _Tiles.Count]].PlayerName;
_Tiles[i].PlayerNr = VisibleProfiles[i + offset * _Tiles.Count];
}
else
{
_Tiles[i].Avatar.Texture = _TextureEmptyTile;
_Tiles[i].Avatar.Color = ColorEmptyTile;
_Tiles[i].Name.Text = "";
_Tiles[i].PlayerNr = -1;
}
_Offset = offset;
}
_Offset = offset;
}
public bool isOverTile(MouseEvent mevent)