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

Added StyleCop Cleanups

Browse Source
This commit is contained in:
Flamefire committed 2013-03-22 23:17:33 +01:00
1 parent d047b12415
commit 1f695a7b83
68 files changed
+4198 -182
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/SongMenu/CSong.cs
+1 -1
View File
@@ -1035,7 +1035,7 @@ namespace VocaluxeLib.Menu.SongMenu
public object Clone()
{
return base.MemberwiseClone();
return this.MemberwiseClone();
}
}
}
VocaluxeLib/Menu/SongMenu/CSongMenu.cs
-1
View File
@@ -212,7 +212,6 @@ namespace VocaluxeLib.Menu.SongMenu
//case ESongMenu.TR_CONFIG_DREIDEL:
// _SongMenu = new CSongMenuDreidel();
// break;
case ESongMenu.TR_CONFIG_TILE_BOARD:
_SongMenu = new CSongMenuTileBoard(_PartyModeID);
break;
VocaluxeLib/Menu/SongMenu/CSongMenuDreidel.cs
-1
View File
@@ -21,7 +21,6 @@
return _actualSelection;
}
*/
public CSongMenuDreidel(int PartyModeID)
: base(PartyModeID) {}
VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
+5 -3
View File
@@ -110,8 +110,9 @@ namespace VocaluxeLib.Menu.SongMenu
protected float _MaxVolume = 100f;
protected int _PreviewSelected //for preview only
protected int _PreviewSelected
{
//for preview only
get
{
if ((_SelectedInternal != _SelectedPending) && (_timer.ElapsedMilliseconds >= _PendingTime))
@@ -158,8 +159,9 @@ namespace VocaluxeLib.Menu.SongMenu
_SelectedInternal = _SelectedPending;
}
protected int _Locked //the real selected song for singing
protected int _Locked
{
//the real selected song for singing
get { return _LockedInternal; }
set { _LockedInternal = value; }
}
@@ -439,7 +441,7 @@ namespace VocaluxeLib.Menu.SongMenu
float vtime = 0f;
CBase.Video.GetFrame(_video, ref _vidtex, time, ref vtime);
if (_VideoFadeTimer.ElapsedMilliseconds <= 3000L)
_vidtex.color.A = (_VideoFadeTimer.ElapsedMilliseconds / 3000f);
_vidtex.color.A = _VideoFadeTimer.ElapsedMilliseconds / 3000f;
else
{
_vidtex.color.A = 1f;
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+3 -3
View File
@@ -341,7 +341,7 @@ namespace VocaluxeLib.Menu.SongMenu
if (!sel)
_actualSelection = -1;
if ((MouseEvent.RB) && (CBase.Songs.GetNumCategories() > 0) && CBase.Songs.GetCurrentCategoryIndex() >= 0 && CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_ON &&
if (MouseEvent.RB && (CBase.Songs.GetNumCategories() > 0) && CBase.Songs.GetCurrentCategoryIndex() >= 0 && CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_ON &&
SongOptions.Selection.CategoryChangeAllowed)
{
ShowCategories();
@@ -355,7 +355,7 @@ namespace VocaluxeLib.Menu.SongMenu
if (CHelper.IsInBounds(_CoverBig.Rect, MouseEvent) || CHelper.IsInBounds(_TextBG.Rect, MouseEvent))
_Locked = _PreviewSelected;
}
else if ((MouseEvent.LB) && (CBase.Songs.GetCurrentCategoryIndex() == -1))
else if (MouseEvent.LB && (CBase.Songs.GetCurrentCategoryIndex() == -1))
{
foreach (CStatic tile in _Tiles)
{
@@ -605,7 +605,7 @@ namespace VocaluxeLib.Menu.SongMenu
private void UpdateList(int offset, bool force = false)
{
bool isInCategory = CBase.Songs.GetCurrentCategoryIndex() >= 0;
int itemCount = (isInCategory) ? CBase.Songs.GetNumVisibleSongs() : CBase.Songs.GetNumCategories();
int itemCount = isInCategory ? CBase.Songs.GetNumVisibleSongs() : CBase.Songs.GetNumCategories();
if (offset >= (itemCount / _NumW) * _NumW - (_NumW * (_NumH - 1)))
offset = (itemCount / _NumW) * _NumW - (_NumW * (_NumH - 1));