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

Merge pull request #337 from Jiiniasu/NamesScroll

Browse Source 
Name Selection Improvements
This commit is contained in:
Florian Küpper authored and GitHub committed 2017-11-28 09:46:42 +01:00
2 parents 709d517772 82e7c0a5a6
commit 29acb6dd4c
1 file changed
+29 -28
Download Patch File Download Diff File Expand all files Collapse all files
VocaluxeLib/Menu/CNameSelection.cs
+29 -28
View File
@@ -194,7 +194,7 @@ namespace VocaluxeLib.Menu
int offset = Offset; int offset = Offset;
UpdateList(Offset + 1); UpdateList(Offset + 1);
if (offset != Offset) if (offset != Offset)
_ActualSelection = 0; _ActualSelection -= _Theme.Tiles.NumW - 1;
} }
break; break;
@@ -204,7 +204,7 @@ namespace VocaluxeLib.Menu
else if (Offset > 0) else if (Offset > 0)
{ {
UpdateList(Offset - 1); UpdateList(Offset - 1);
_ActualSelection = _Tiles.Count - 1; _ActualSelection += _Theme.Tiles.NumW - 1;
} }
break; break;
@@ -214,7 +214,6 @@ namespace VocaluxeLib.Menu
else if (Offset > 0) else if (Offset > 0)
{ {
UpdateList(Offset - 1); UpdateList(Offset - 1);
_ActualSelection += _Tiles.Count - _Theme.Tiles.NumW;
} }
break; break;
@@ -228,27 +227,20 @@ namespace VocaluxeLib.Menu
{ {
int offset = Offset; int offset = Offset;
UpdateList(Offset + 1); UpdateList(Offset + 1);
if (offset != Offset) }
if (_Tiles[_ActualSelection].ProfileID == Guid.Empty)
{
_ActualSelection = _Tiles.Count - _Theme.Tiles.NumW;
while(_Tiles[_ActualSelection + 1].ProfileID != Guid.Empty)
{ {
_ActualSelection = _ActualSelection - _Tiles.Count + _Theme.Tiles.NumW; _ActualSelection++;
if (_Tiles[_ActualSelection].ProfileID == Guid.Empty)
{
for (int i = _Tiles.Count - 1; i >= 0; i--)
{
if (_Tiles[i].ProfileID != Guid.Empty)
{
_ActualSelection = i;
break;
}
}
}
} }
} }
break; break;
} }
if (Offset * _Tiles.Count + _ActualSelection < _VisibleProfiles.Count) if (Offset * _Theme.Tiles.NumW + _ActualSelection < _VisibleProfiles.Count)
SelectedID = _VisibleProfiles.ElementAt(Offset * _Tiles.Count + _ActualSelection); SelectedID = _VisibleProfiles.ElementAt(Offset * _Theme.Tiles.NumW + _ActualSelection);
else else
SelectedID = Guid.Empty; SelectedID = Guid.Empty;
} }
@@ -257,12 +249,12 @@ namespace VocaluxeLib.Menu
{ {
for (int i = 0; i < _Tiles.Count; i++) for (int i = 0; i < _Tiles.Count; i++)
{ {
if (CHelper.IsInBounds(_Tiles[i].Avatar.Rect, mevent)) if (CHelper.IsInBounds(_Tiles[i].Avatar.Rect, mevent) && _Tiles[i].ProfileID != Guid.Empty)
{ {
_ActualSelection = i; _ActualSelection = i;
if (Offset * _Tiles.Count + _ActualSelection < _VisibleProfiles.Count) if (Offset * _Theme.Tiles.NumW + _ActualSelection < _VisibleProfiles.Count)
SelectedID = _VisibleProfiles.ElementAt(Offset * _Tiles.Count + _ActualSelection); SelectedID = _VisibleProfiles.ElementAt(Offset * _Theme.Tiles.NumW + _ActualSelection);
else else
SelectedID = Guid.Empty; SelectedID = Guid.Empty;
} }
@@ -299,7 +291,7 @@ namespace VocaluxeLib.Menu
public void UpdateList() public void UpdateList()
{ {
_UpdateVisibleProfiles(); _UpdateVisibleProfiles();
if (_Tiles.Count * (Offset + 1) - _VisibleProfiles.Count >= _Tiles.Count * Offset) if (_Theme.Tiles.NumW * (Offset + 1) - _VisibleProfiles.Count >= _Theme.Tiles.NumW * Offset)
UpdateList(Offset - 1); UpdateList(Offset - 1);
else else
UpdateList(Offset); UpdateList(Offset);
@@ -307,17 +299,16 @@ namespace VocaluxeLib.Menu
public void UpdateList(int offset) public void UpdateList(int offset)
{ {
if (offset < 0) offset = offset.Clamp(0, _GetMaxOffset());
offset = 0;
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 * _Theme.Tiles.NumW) < _VisibleProfiles.Count)
{ {
_Tiles[i].Avatar.Texture = CBase.Profiles.GetAvatar(_VisibleProfiles[i + offset * _Tiles.Count]); _Tiles[i].Avatar.Texture = CBase.Profiles.GetAvatar(_VisibleProfiles[i + offset * _Theme.Tiles.NumW]);
_Tiles[i].Avatar.Color = new SColorF(1, 1, 1, 1); _Tiles[i].Avatar.Color = new SColorF(1, 1, 1, 1);
_Tiles[i].Name.Text = CBase.Profiles.GetPlayerName(_VisibleProfiles[i + offset * _Tiles.Count]); _Tiles[i].Name.Text = CBase.Profiles.GetPlayerName(_VisibleProfiles[i + offset * _Theme.Tiles.NumW]);
_Tiles[i].ProfileID = _VisibleProfiles.ElementAt(i + offset * _Tiles.Count); _Tiles[i].ProfileID = _VisibleProfiles.ElementAt(i + offset * _Theme.Tiles.NumW);
} }
else else
{ {
@@ -466,6 +457,16 @@ namespace VocaluxeLib.Menu
} }
} }
private int _GetMaxOffset()
{
int maxOffset = (int)Math.Ceiling((decimal)(_VisibleProfiles.Count - _Tiles.Count) / _Theme.Tiles.NumW);
if (maxOffset < 0)
{
return 0;
}
return maxOffset;
}
public object GetTheme() public object GetTheme()
{ {
return _Theme; return _Theme;