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

Fixed Playlist buttons (2nd try)

Browse Source
This commit is contained in:
lukeIam committed 2015-09-08 16:52:23 +02:00
1 parent fa9da672cf
commit 28e4c2b3f5
2 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Ambient/Screens/ScreenSong.xml
+1 -1
View File
@@ -1042,7 +1042,7 @@
<X>970</X>
<Y>80</Y>
<W>295</W>
<H>500</H>
<H>460</H>
<Z>-0.9</Z>
</Rect>
<EntryHeight>50</EntryHeight>
VocaluxeLib/Menu/CPlaylist.cs
+10 -10
View File
@@ -171,7 +171,7 @@ namespace VocaluxeLib.Menu
public SRectF Rect
{
get { return MaxRect; }
get { return _CompleteRect; }
}
public SRectF MaxRect { get; set; }
private bool _Selectable = true;
@@ -1038,27 +1038,27 @@ namespace VocaluxeLib.Menu
{
_PlaylistElements.Clear();
for (int i = 0; i < Math.Floor(Rect.H / _Theme.EntryHeight); i++)
for (int i = 0; i < Math.Floor(_Theme.Rect.H / _Theme.EntryHeight); i++)
{
var en = new CPlaylistElement
{
Background = new CStatic(_PartyModeID, _Theme.SkinBackground, _BackgroundColor,
new SRectF(Rect.X, Rect.Y + (i * _Theme.EntryHeight), Rect.W, _Theme.EntryHeight, Rect.Z)),
new SRectF(_Theme.Rect.X, _Theme.Rect.Y + (i * _Theme.EntryHeight), _Theme.Rect.W, _Theme.EntryHeight, _Theme.Rect.Z)),
Cover = new CStatic(_Theme.StaticCover, _PartyModeID)
};
en.Cover.LoadSkin();
en.Cover.Y += Rect.Y + (i * _Theme.EntryHeight);
en.Cover.X += Rect.X;
en.Cover.Y += _Theme.Rect.Y + (i * _Theme.EntryHeight);
en.Cover.X += _Theme.Rect.X;
en.Text1 = new CText(_Text1);
en.Text1.X += Rect.X;
en.Text1.Y += Rect.Y + (i * _Theme.EntryHeight);
en.Text1.X += _Theme.Rect.X;
en.Text1.Y += _Theme.Rect.Y + (i * _Theme.EntryHeight);
en.SelectSlide = new CSelectSlide(_SelectSlideGameMode);
en.SelectSlide.LoadSkin();
en.SelectSlide.X += Rect.X;
en.SelectSlide.Y += Rect.Y + (i * _Theme.EntryHeight);
en.SelectSlide.X += _Theme.Rect.X;
en.SelectSlide.Y += _Theme.Rect.Y + (i * _Theme.EntryHeight);
en.Content = -1;
@@ -1181,7 +1181,7 @@ namespace VocaluxeLib.Menu
private void _UpdateRect()
{
//Check for highest x/y-coords
_CompleteRect = Rect;
_CompleteRect = _Theme.Rect;
//ButtonPlaylistClose
if (_ButtonPlaylistClose.Rect.X < _CompleteRect.X)
_CompleteRect.X = _ButtonPlaylistClose.Rect.X;