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

Fix for inconsistent song Menu

Browse Source 
Multiple refactoring due to ambiguous meanings
This commit is contained in:
Flamefire committed 2013-10-18 23:25:42 +02:00
1 parent 155718456c
commit 3b82d5c13c
8 files changed
+180 -144
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
+17 -14
View File
@@ -130,7 +130,6 @@ namespace VocaluxeLib.Menu.SongMenu
{
if ((_SelectedInternal != _SelectedPending) && (_Timer.ElapsedMilliseconds >= _PendingTime))
{
_Timer.Stop();
_Timer.Reset();
_SelectedInternal = _SelectedPending;
}
@@ -140,7 +139,6 @@ namespace VocaluxeLib.Menu.SongMenu
{
if (value == -1)
{
_Timer.Stop();
_Timer.Reset();
_SelectedInternal = -1;
@@ -148,26 +146,28 @@ namespace VocaluxeLib.Menu.SongMenu
return;
}
if ((value != _SelectedInternal) && (value != _SelectedPending))
if (value == _SelectedPending)
{
_Timer.Reset();
_Timer.Start();
_SelectedPending = value;
if (_Timer.ElapsedMilliseconds >= _PendingTime || _SelectedInternal == -1)
{
_Timer.Reset();
_SelectedInternal = _SelectedPending;
}
}
if ((value == _SelectedPending) && ((_Timer.ElapsedMilliseconds >= _PendingTime) || (_SelectedInternal == -1)))
else
{
_Timer.Stop();
_Timer.Reset();
_SelectedInternal = _SelectedPending;
if (value != _SelectedInternal)
{
_Timer.Reset();
_Timer.Start();
}
_SelectedPending = value;
}
}
}
protected void _SetSelectedNow()
{
_Timer.Stop();
_Timer.Reset();
_SelectedInternal = _SelectedPending;
}
@@ -518,7 +518,10 @@ namespace VocaluxeLib.Menu.SongMenu
_Active = active;
}
public virtual bool IsMouseOverActualSelection(SMouseEvent mEvent) { return false; }
public virtual bool IsMouseOverActualSelection(SMouseEvent mEvent)
{
return false;
}
public virtual int GetSelectedSong()
{