Merge remote-tracking branch 'remotes/flokuep/release-0.3' into release-0.3

This commit is contained in:
Alexander Eckart committed 2013-06-01 10:45:26 +02:00
commit 248f036e72
11 files changed
+110 -28

No files matched your search

+2
View File
@@ -199,6 +199,8 @@ namespace VocaluxeLib.Menu
{
_Theme.Text = value;
_Text = translation;
if (_EditMode)
_Text += "|";
_PositionNeedsUpdate = true;
}
}
+5
View File
@@ -98,6 +98,11 @@ namespace VocaluxeLib.Menu.SongMenu
_SongMenu.SetActive(active);
}
public bool IsMouseOverActualSelection(SMouseEvent mEvent)
{
return _SongMenu.IsMouseOverActualSelection(mEvent);
}
public int GetSelectedSong()
{
return _SongMenu.GetSelectedSong();
@@ -518,6 +518,8 @@ namespace VocaluxeLib.Menu.SongMenu
_Active = active;
}
public virtual bool IsMouseOverActualSelection(SMouseEvent mEvent) { return false; }
public virtual int GetSelectedSong()
{
return -1;
@@ -485,6 +485,15 @@ namespace VocaluxeLib.Menu.SongMenu
return _Locked;
}
public override bool IsMouseOverActualSelection(SMouseEvent mEvent)
{
CStatic selCov = GetSelectedSongCover();
if (selCov.Texture == null)
return false;
SRectF rect = new SRectF(selCov.Rect.X - selCov.Rect.W*0.2f, selCov.Rect.Y - selCov.Rect.H*0.2f, selCov.Rect.W*1.2f, selCov.Rect.H*1.2f, selCov.Rect.Z);
return CHelper.IsInBounds(rect, mEvent);
}
public override CStatic GetSelectedSongCover()
{
foreach (CStatic tile in _Tiles)
+2
View File
@@ -40,6 +40,8 @@ namespace VocaluxeLib.Menu.SongMenu
bool IsActive();
void SetActive(bool active);
bool IsMouseOverActualSelection(SMouseEvent mEvent);
int GetSelectedCategory();
void SetSelectedCategory(int categoryNr);
int GetActualSelection();