From aa77d2d95c0a7decdf56aaf3b9c88b8089af4044 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sun, 21 Dec 2014 12:38:40 +0100 Subject: [PATCH] Fix drag&drop of playlist --- VocaluxeLib/Menu/CObjectInteractions.cs | 9 +++++++++ VocaluxeLib/Menu/CPlaylist.cs | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/VocaluxeLib/Menu/CObjectInteractions.cs b/VocaluxeLib/Menu/CObjectInteractions.cs index 0520e451..e7623787 100644 --- a/VocaluxeLib/Menu/CObjectInteractions.cs +++ b/VocaluxeLib/Menu/CObjectInteractions.cs @@ -91,6 +91,15 @@ namespace VocaluxeLib.Menu private void _SetSelected(int newSelection) { IMenuElement el = _GetElement(_Selection); + if (newSelection == _Selection) + { + // Don't change current selection + if (el == null) + _Selection = -1; + else if (!el.Selected) + el.Selected = true; + return; + } if (el != null) el.Selected = false; _Selection = newSelection; diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs index ced7bb57..f22387d8 100644 --- a/VocaluxeLib/Menu/CPlaylist.cs +++ b/VocaluxeLib/Menu/CPlaylist.cs @@ -1039,7 +1039,7 @@ namespace VocaluxeLib.Menu en.Cover.LoadSkin(); en.Cover.Y += Rect.Y + (i * _Theme.EntryHeight); - en.Cover.X += Rect.X; + en.Cover.X += Rect.X; en.Text1 = new CText(_Text1); en.Text1.X += Rect.X;