Unify object interactions

This commit is contained in:
Flamefire committed 2014-10-18 18:46:13 +02:00
1 parent d8cce13211
commit b07d31f697
31 files changed
+836 -2005

No files matched your search

@@ -110,7 +110,7 @@ namespace VocaluxeLib.PartyModes.Challenge
{ {
base.HandleMouse(mouseEvent); base.HandleMouse(mouseEvent);
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
_UpdateSlides(); _UpdateSlides();
if (_Buttons[_ButtonBack].Selected) if (_Buttons[_ButtonBack].Selected)
@@ -207,7 +207,7 @@ namespace VocaluxeLib.PartyModes.Challenge
{ {
base.HandleMouse(mouseEvent); base.HandleMouse(mouseEvent);
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (!_ExitPopupVisible) if (!_ExitPopupVisible)
{ {
@@ -110,7 +110,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
{ {
base.HandleMouse(mouseEvent); base.HandleMouse(mouseEvent);
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
_UpdateSlides(); _UpdateSlides();
if (_Buttons[_ButtonBack].Selected) if (_Buttons[_ButtonBack].Selected)
@@ -207,7 +207,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
{ {
base.HandleMouse(mouseEvent); base.HandleMouse(mouseEvent);
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (!_ExitPopupVisible) if (!_ExitPopupVisible)
{ {
@@ -125,7 +125,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
{ {
base.HandleMouse(mouseEvent); base.HandleMouse(mouseEvent);
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
_UpdateSlides(); _UpdateSlides();
if (_Buttons[_ButtonBack].Selected) if (_Buttons[_ButtonBack].Selected)
@@ -221,7 +221,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
{ {
base.HandleMouse(mouseEvent); base.HandleMouse(mouseEvent);
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (!_ExitPopupVisible) if (!_ExitPopupVisible)
{ {
@@ -79,23 +79,20 @@ namespace Vocaluxe.Screens
} }
} }
public override SRectF ScreenArea
{
get { return _Statics[_StaticBG].Rect; }
}
public override void Init() public override void Init()
{ {
base.Init(); base.Init();
_ThemeStatics = new string[] {_StaticBG, _StaticCover}; _ThemeStatics = new string[] {_StaticBG, _StaticCover};
_ThemeTexts = new string[] {_TextCurrentSong}; _ThemeTexts = new string[] {_TextCurrentSong};
_ThemeButtons = new string[] {_ButtonPlay, _ButtonPause, _ButtonPrevious, _ButtonNext, _ButtonRepeat, _ButtonShowVideo, _ButtonSing, _ButtonToBackgroundVideo}; _ThemeButtons = new string[] {_ButtonPlay, _ButtonPause, _ButtonPrevious, _ButtonNext, _ButtonRepeat, _ButtonShowVideo, _ButtonSing, _ButtonToBackgroundVideo};
} }
public override void LoadTheme(string xmlPath)
{
base.LoadTheme(xmlPath);
_ScreenArea = _Statics[_StaticBG].Rect;
}
public override bool HandleInput(SKeyEvent keyEvent) public override bool HandleInput(SKeyEvent keyEvent)
{ {
base.HandleInput(keyEvent); base.HandleInput(keyEvent);
@@ -136,7 +133,7 @@ namespace Vocaluxe.Screens
public override bool HandleMouse(SMouseEvent mouseEvent) public override bool HandleMouse(SMouseEvent mouseEvent)
{ {
base.HandleMouse(mouseEvent); base.HandleMouse(mouseEvent);
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (_Buttons[_ButtonNext].Selected) if (_Buttons[_ButtonNext].Selected)
CBackgroundMusic.Next(); CBackgroundMusic.Next();
@@ -30,9 +30,13 @@ namespace Vocaluxe.Screens
} }
private const string _StaticBG = "StaticBG"; private const string _StaticBG = "StaticBG";
private const string _SelectSlideVolume = "SelectSlideVolume"; private const string _SelectSlideVolume = "SelectSlideVolume";
public override SRectF ScreenArea
{
get { return _Statics[_StaticBG].Rect; }
}
public override void Init() public override void Init()
{ {
base.Init(); base.Init();
@@ -45,7 +49,6 @@ namespace Vocaluxe.Screens
{ {
base.LoadTheme(xmlPath); base.LoadTheme(xmlPath);
_ScreenArea = _Statics[_StaticBG].Rect;
_SelectSlides[_SelectSlideVolume].AddValues(new string[] _SelectSlides[_SelectSlideVolume].AddValues(new string[]
{"0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"}); {"0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"});
} }
@@ -64,7 +67,7 @@ namespace Vocaluxe.Screens
_SaveConfig(); _SaveConfig();
return true; return true;
} }
if (mouseEvent.Wheel > 0 && CHelper.IsInBounds(_ScreenArea, mouseEvent)) if (mouseEvent.Wheel > 0 && CHelper.IsInBounds(ScreenArea, mouseEvent))
{ {
if (_SelectSlides[_SelectSlideVolume].Selection - mouseEvent.Wheel >= 0) if (_SelectSlides[_SelectSlideVolume].Selection - mouseEvent.Wheel >= 0)
_SelectSlides[_SelectSlideVolume].Selection = _SelectSlides[_SelectSlideVolume].Selection - mouseEvent.Wheel; _SelectSlides[_SelectSlideVolume].Selection = _SelectSlides[_SelectSlideVolume].Selection - mouseEvent.Wheel;
@@ -73,7 +76,7 @@ namespace Vocaluxe.Screens
_SaveConfig(); _SaveConfig();
return true; return true;
} }
if (mouseEvent.Wheel < 0 && CHelper.IsInBounds(_ScreenArea, mouseEvent)) if (mouseEvent.Wheel < 0 && CHelper.IsInBounds(ScreenArea, mouseEvent))
{ {
if (_SelectSlides[_SelectSlideVolume].Selection - mouseEvent.Wheel < _SelectSlides[_SelectSlideVolume].NumValues) if (_SelectSlides[_SelectSlideVolume].Selection - mouseEvent.Wheel < _SelectSlides[_SelectSlideVolume].NumValues)
_SelectSlides[_SelectSlideVolume].Selection = _SelectSlides[_SelectSlideVolume].Selection - mouseEvent.Wheel; _SelectSlides[_SelectSlideVolume].Selection = _SelectSlides[_SelectSlideVolume].Selection - mouseEvent.Wheel;
+1 -1
View File
@@ -130,7 +130,7 @@ namespace Vocaluxe.Screens
public override bool HandleMouse(SMouseEvent mouseEvent) public override bool HandleMouse(SMouseEvent mouseEvent)
{ {
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) {} if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent)) {}
if (mouseEvent.LB) if (mouseEvent.LB)
_LeaveScreen(); _LeaveScreen();
+1 -1
View File
@@ -116,7 +116,7 @@ namespace Vocaluxe.Screens
{ {
base.HandleMouse(mouseEvent); base.HandleMouse(mouseEvent);
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (_Buttons[_ButtonSing].Selected) if (_Buttons[_ButtonSing].Selected)
{ {
+1 -1
View File
@@ -453,7 +453,7 @@ namespace Vocaluxe.Screens
stopSelectingFast = true; stopSelectingFast = true;
} }
} }
else if (mouseEvent.LB && _IsMouseOver(mouseEvent)) else if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (_Buttons[_ButtonBack].Selected) if (_Buttons[_ButtonBack].Selected)
CGraphics.FadeTo(EScreens.ScreenSong); CGraphics.FadeTo(EScreens.ScreenSong);
+1 -1
View File
@@ -92,7 +92,7 @@ namespace Vocaluxe.Screens
{ {
base.HandleMouse(mouseEvent); base.HandleMouse(mouseEvent);
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (_Buttons[_ButtonOptionsGame].Selected) if (_Buttons[_ButtonOptionsGame].Selected)
CGraphics.FadeTo(EScreens.ScreenOptionsGame); CGraphics.FadeTo(EScreens.ScreenOptionsGame);
+1 -1
View File
@@ -113,7 +113,7 @@ namespace Vocaluxe.Screens
CGraphics.FadeTo(EScreens.ScreenOptions); CGraphics.FadeTo(EScreens.ScreenOptions);
} }
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (_Buttons[_ButtonExit].Selected) if (_Buttons[_ButtonExit].Selected)
{ {
+1 -1
View File
@@ -99,7 +99,7 @@ namespace Vocaluxe.Screens
_SaveConfig(); _SaveConfig();
CGraphics.FadeTo(EScreens.ScreenOptions); CGraphics.FadeTo(EScreens.ScreenOptions);
} }
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
_SaveConfig(); _SaveConfig();
if (_Buttons[_ButtonExit].Selected) if (_Buttons[_ButtonExit].Selected)
+1 -1
View File
@@ -186,7 +186,7 @@ namespace Vocaluxe.Screens
CGraphics.FadeTo(EScreens.ScreenOptions); CGraphics.FadeTo(EScreens.ScreenOptions);
} }
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (_SelectSlides[_SelectSlideRecordDevices].Selected) if (_SelectSlides[_SelectSlideRecordDevices].Selected)
_OnDeviceEvent(); _OnDeviceEvent();
+1 -1
View File
@@ -115,7 +115,7 @@ namespace Vocaluxe.Screens
_SaveConfig(); _SaveConfig();
CGraphics.FadeTo(EScreens.ScreenOptions); CGraphics.FadeTo(EScreens.ScreenOptions);
} }
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
_SaveConfig(); _SaveConfig();
if (_Buttons[_ButtonExit].Selected) if (_Buttons[_ButtonExit].Selected)
+1 -1
View File
@@ -119,7 +119,7 @@ namespace Vocaluxe.Screens
if (mouseEvent.RB) if (mouseEvent.RB)
_Close(); _Close();
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (_Buttons[_ButtonExit].Selected) if (_Buttons[_ButtonExit].Selected)
_Close(); _Close();
+1 -1
View File
@@ -141,7 +141,7 @@ namespace Vocaluxe.Screens
CGraphics.FadeTo(EScreens.ScreenOptions); CGraphics.FadeTo(EScreens.ScreenOptions);
} }
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (_SelectSlides[_SelectSlideWebcamDevices].Selected) if (_SelectSlides[_SelectSlideWebcamDevices].Selected)
_OnDeviceEvent(); _OnDeviceEvent();
@@ -81,7 +81,7 @@ namespace Vocaluxe.Screens
CGraphics.FadeTo(EScreens.ScreenOptionsVideo); CGraphics.FadeTo(EScreens.ScreenOptionsVideo);
} }
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
_SaveConfig(); _SaveConfig();
if (_Buttons[_ButtonExit].Selected) if (_Buttons[_ButtonExit].Selected)
+1 -1
View File
@@ -89,7 +89,7 @@ namespace Vocaluxe.Screens
{ {
base.HandleMouse(mouseEvent); base.HandleMouse(mouseEvent);
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (_Buttons[_ButtonStart].Selected) if (_Buttons[_ButtonStart].Selected)
_StartPartyMode(); _StartPartyMode();
+1 -1
View File
@@ -196,7 +196,7 @@ namespace Vocaluxe.Screens
if (_EditMode == EEditMode.None) if (_EditMode == EEditMode.None)
base.HandleMouse(mouseEvent); base.HandleMouse(mouseEvent);
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (_Buttons[_ButtonExit].Selected) if (_Buttons[_ButtonExit].Selected)
CGraphics.FadeTo(EScreens.ScreenMain); CGraphics.FadeTo(EScreens.ScreenMain);
+1 -1
View File
@@ -302,7 +302,7 @@ namespace Vocaluxe.Screens
_SetInteractionToButton(_Buttons[_ButtonContinue]); _SetInteractionToButton(_Buttons[_ButtonContinue]);
} }
if (mouseEvent.LB && _IsMouseOver(mouseEvent) && _Pause) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent) && _Pause)
{ {
if (_Buttons[_ButtonContinue].Selected && _Pause) if (_Buttons[_ButtonContinue].Selected && _Pause)
_TogglePause(); _TogglePause();
+1 -1
View File
@@ -476,7 +476,7 @@ namespace Vocaluxe.Screens
if (mouseEvent.LB) if (mouseEvent.LB)
{ {
if (_IsMouseOver(mouseEvent)) if (_IsMouseOverCurSelection(mouseEvent))
{ {
if (_Buttons[_ButtonOpenOptions].Selected) if (_Buttons[_ButtonOpenOptions].Selected)
{ {
+1 -1
View File
@@ -89,7 +89,7 @@ namespace Vocaluxe.Screens
public override bool HandleMouse(SMouseEvent mouseEvent) public override bool HandleMouse(SMouseEvent mouseEvent)
{ {
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) {} if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent)) {}
if (mouseEvent.LB) if (mouseEvent.LB)
CGraphics.FadeTo(EScreens.ScreenMain); CGraphics.FadeTo(EScreens.ScreenMain);
+29 -23
View File
@@ -35,39 +35,45 @@ namespace VocaluxeLib.Menu
class CInteraction class CInteraction
{ {
private readonly int _Num; public readonly int Num;
private readonly EType _Type; public readonly EType Type;
public int Num
{
get { return _Num; }
}
public EType Type
{
get { return _Type; }
}
public bool ThemeEditorOnly public bool ThemeEditorOnly
{ {
get get
{ {
return _Type == EType.Background || return Type == EType.Background ||
_Type == EType.NameSelection || Type == EType.NameSelection ||
_Type == EType.Text || Type == EType.Text ||
_Type == EType.Static || Type == EType.Static ||
_Type == EType.SongMenu || Type == EType.SongMenu ||
_Type == EType.Lyric || Type == EType.Lyric ||
_Type == EType.SingNote || Type == EType.SingNote ||
_Type == EType.Equalizer || Type == EType.Equalizer ||
_Type == EType.Playlist; Type == EType.Playlist;
}
}
public bool DrawAsForeground
{
get
{
return Type == EType.Button ||
Type == EType.SelectSlide ||
Type == EType.Static ||
Type == EType.NameSelection ||
Type == EType.Text ||
Type == EType.SongMenu ||
Type == EType.Equalizer ||
Type == EType.Playlist ||
Type == EType.ParticleEffect;
} }
} }
public CInteraction(int num, EType type) public CInteraction(int num, EType type)
{ {
_Num = num; Num = num;
_Type = type; Type = type;
} }
} }
} }
+11 -1351
View File
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -434,7 +434,7 @@ namespace VocaluxeLib.Menu
} }
} }
else if (mouseEvent.LB && _IsMouseOver(mouseEvent)) else if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (_Buttons[_ButtonBack].Selected) if (_Buttons[_ButtonBack].Selected)
Back(); Back();
+407 -215
View File
@@ -19,115 +19,95 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using VocaluxeLib.Menu.SingNotes;
using VocaluxeLib.Menu.SongMenu;
namespace VocaluxeLib.Menu namespace VocaluxeLib.Menu
{ {
class CObjectInteractions public abstract class CObjectInteractions
{ {
private List<CInteraction> _Interactions; private readonly List<CInteraction> _Interactions = new List<CInteraction>();
private int _Selection; private int _Selection;
private List<CStatic> _Statics;
private List<CText> _Texts;
private List<CButton> _Buttons;
private List<CSelectSlide> _SelectSlides;
private int _PrevMouseX; private int _PrevMouseX;
private int _PrevMouseY; private int _PrevMouseY;
protected int _MouseDX; protected int _MouseDX;
protected int _MouseDY; protected int _MouseDY;
public bool Active; protected bool _Active;
protected SRectF _ScreenArea; protected readonly COrderedDictionaryLite<CButton> _Buttons;
protected readonly COrderedDictionaryLite<CText> _Texts;
public SRectF ScreenArea protected readonly COrderedDictionaryLite<CBackground> _Backgrounds;
{ protected readonly COrderedDictionaryLite<CStatic> _Statics;
get { return _ScreenArea; } protected readonly COrderedDictionaryLite<CSelectSlide> _SelectSlides;
} protected readonly COrderedDictionaryLite<CSongMenu> _SongMenus;
protected readonly COrderedDictionaryLite<CLyric> _Lyrics;
protected readonly COrderedDictionaryLite<CSingNotes> _SingNotes;
protected readonly COrderedDictionaryLite<CNameSelection> _NameSelections;
protected readonly COrderedDictionaryLite<CEqualizer> _Equalizers;
protected readonly COrderedDictionaryLite<CPlaylist> _Playlists;
protected readonly COrderedDictionaryLite<CParticleEffect> _ParticleEffects;
protected readonly COrderedDictionaryLite<CScreenSetting> _ScreenSettings;
public CObjectInteractions() public CObjectInteractions()
{ {
_Init(); _Backgrounds = new COrderedDictionaryLite<CBackground>(this);
_Buttons = new COrderedDictionaryLite<CButton>(this);
_Texts = new COrderedDictionaryLite<CText>(this);
_Statics = new COrderedDictionaryLite<CStatic>(this);
_SelectSlides = new COrderedDictionaryLite<CSelectSlide>(this);
_SongMenus = new COrderedDictionaryLite<CSongMenu>(this);
_Lyrics = new COrderedDictionaryLite<CLyric>(this);
_SingNotes = new COrderedDictionaryLite<CSingNotes>(this);
_NameSelections = new COrderedDictionaryLite<CNameSelection>(this);
_Equalizers = new COrderedDictionaryLite<CEqualizer>(this);
_Playlists = new COrderedDictionaryLite<CPlaylist>(this);
_ParticleEffects = new COrderedDictionaryLite<CParticleEffect>(this);
_ScreenSettings = new COrderedDictionaryLite<CScreenSetting>(this);
} }
protected void _Init() public virtual void Init()
{ {
_Interactions = new List<CInteraction>();
_Selection = 0; _Selection = 0;
_Statics = new List<CStatic>();
_Texts = new List<CText>();
_Buttons = new List<CButton>();
_SelectSlides = new List<CSelectSlide>();
_PrevMouseX = 0; _PrevMouseX = 0;
_PrevMouseY = 0; _PrevMouseY = 0;
_MouseDX = 0; _MouseDX = 0;
_MouseDY = 0; _MouseDY = 0;
Active = false; _Active = false;
_ScreenArea = CBase.Settings.GetRenderRect();
} }
public void Clear() protected void _ClearElements()
{ {
_Interactions.Clear(); _Interactions.Clear();
_Statics.Clear(); _Backgrounds.Clear();
_Texts.Clear();
_Buttons.Clear(); _Buttons.Clear();
_Texts.Clear();
_Statics.Clear();
_SelectSlides.Clear(); _SelectSlides.Clear();
_SongMenus.Clear();
_Selection = 0; _Lyrics.Clear();
_SingNotes.Clear();
_PrevMouseX = 0; _NameSelections.Clear();
_PrevMouseY = 0; _Equalizers.Clear();
_Playlists.Clear();
_MouseDX = 0; _ParticleEffects.Clear();
_MouseDY = 0; _ScreenSettings.Clear();
Active = false;
} }
#region GetLists
public List<CButton> GetButtons()
{
return _Buttons;
}
public List<CSelectSlide> GetSelectSlides()
{
return _SelectSlides;
}
#endregion GetLists
#region ElementHandler
#region Get Arrays
public CButton[] Buttons
{
get { return _Buttons.ToArray(); }
}
public CSelectSlide[] SelectSlides
{
get { return _SelectSlides.ToArray(); }
}
#endregion Get Arrays
#endregion ElementHandler
#region MenuHandler #region MenuHandler
public bool HandleInput(SKeyEvent keyEvent) public virtual bool HandleInput(SKeyEvent keyEvent)
{ {
if (!CBase.Settings.IsTabNavigation()) if (!CBase.Settings.IsTabNavigation())
{ {
if (keyEvent.Key == Keys.Left) if (keyEvent.Key == Keys.Left)
{ {
if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.SelectSlide && keyEvent.Mod != EModifier.Shift) if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.SelectSlide && keyEvent.Mod != EModifier.Shift)
keyEvent.Handled = PrevElement(); keyEvent.Handled = _PrevElement();
else else
keyEvent.Handled = _NextInteraction(keyEvent); keyEvent.Handled = _NextInteraction(keyEvent);
} }
@@ -135,7 +115,7 @@ namespace VocaluxeLib.Menu
if (keyEvent.Key == Keys.Right) if (keyEvent.Key == Keys.Right)
{ {
if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.SelectSlide && keyEvent.Mod != EModifier.Shift) if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.SelectSlide && keyEvent.Mod != EModifier.Shift)
keyEvent.Handled = NextElement(); keyEvent.Handled = _NextElement();
else else
keyEvent.Handled = _NextInteraction(keyEvent); keyEvent.Handled = _NextInteraction(keyEvent);
} }
@@ -154,16 +134,16 @@ namespace VocaluxeLib.Menu
} }
if (keyEvent.Key == Keys.Left) if (keyEvent.Key == Keys.Left)
PrevElement(); _PrevElement();
if (keyEvent.Key == Keys.Right) if (keyEvent.Key == Keys.Right)
NextElement(); _NextElement();
} }
return true; return true;
} }
public bool HandleMouse(SMouseEvent mouseEvent) public virtual bool HandleMouse(SMouseEvent mouseEvent)
{ {
int selection = _Selection; int selection = _Selection;
ProcessMouseMove(mouseEvent.X, mouseEvent.Y); ProcessMouseMove(mouseEvent.X, mouseEvent.Y);
@@ -182,18 +162,13 @@ namespace VocaluxeLib.Menu
return true; return true;
} }
public bool HandleInputThemeEditor(SKeyEvent keyEvent) public virtual bool HandleInputThemeEditor(SKeyEvent keyEvent)
{ {
_UnsetHighlighted(_Selection); _UnsetHighlighted(_Selection);
if (keyEvent.KeyPressed) {} if (!keyEvent.KeyPressed)
else
{ {
switch (keyEvent.Key) switch (keyEvent.Key)
{ {
case Keys.S:
CBase.Graphics.SaveTheme();
break;
case Keys.Up: case Keys.Up:
if (keyEvent.Mod == EModifier.Ctrl) if (keyEvent.Mod == EModifier.Ctrl)
_MoveElement(0, -1); _MoveElement(0, -1);
@@ -236,7 +211,7 @@ namespace VocaluxeLib.Menu
return true; return true;
} }
public bool HandleMouseThemeEditor(SMouseEvent mouseEvent) public virtual bool HandleMouseThemeEditor(SMouseEvent mouseEvent)
{ {
_UnsetHighlighted(_Selection); _UnsetHighlighted(_Selection);
_MouseDX = mouseEvent.X - _PrevMouseX; _MouseDX = mouseEvent.X - _PrevMouseX;
@@ -300,7 +275,20 @@ namespace VocaluxeLib.Menu
#endregion MenuHandler #endregion MenuHandler
#region Drawing #region Drawing
public void Draw() public virtual bool Draw()
{
_DrawBG();
_DrawFG();
return true;
}
protected void _DrawBG()
{
foreach (CBackground bg in _Backgrounds)
bg.Draw();
}
protected void _DrawFG()
{ {
if (_Interactions.Count <= 0) if (_Interactions.Count <= 0)
return; return;
@@ -309,14 +297,7 @@ namespace VocaluxeLib.Menu
for (int i = 0; i < _Interactions.Count; i++) for (int i = 0; i < _Interactions.Count; i++)
{ {
if (_IsVisible(i) && ( if (_IsVisible(i) && _Interactions[i].DrawAsForeground)
_Interactions[i].Type == EType.Button ||
_Interactions[i].Type == EType.SelectSlide ||
_Interactions[i].Type == EType.Static ||
_Interactions[i].Type == EType.NameSelection ||
_Interactions[i].Type == EType.Text ||
_Interactions[i].Type == EType.SongMenu ||
_Interactions[i].Type == EType.Equalizer))
{ {
var zs = new SZSort {ID = i, Z = _GetZValue(i)}; var zs = new SZSort {ID = i, Z = _GetZValue(i)};
items.Add(zs); items.Add(zs);
@@ -334,35 +315,72 @@ namespace VocaluxeLib.Menu
} }
#endregion Drawing #endregion Drawing
#region Elements #region Element-Adding
public int AddStatic(CStatic stat) protected void _AddBackground(CBackground bg, String key = null)
{ {
_Statics.Add(stat); _AddInteraction(_Backgrounds.Add(bg, key), EType.Background);
_AddInteraction(_Statics.Count - 1, EType.Static);
return _Statics.Count - 1;
} }
public int AddText(CText text) protected void _AddButton(CButton button, String key = null)
{ {
_Texts.Add(text); _AddInteraction(_Buttons.Add(button, key), EType.Button);
_AddInteraction(_Texts.Count - 1, EType.Text);
return _Texts.Count - 1;
} }
public int AddButton(CButton button) protected void _AddSelectSlide(CSelectSlide slide, String key = null)
{ {
_Buttons.Add(button); _AddInteraction(_SelectSlides.Add(slide, key), EType.SelectSlide);
_AddInteraction(_Buttons.Count - 1, EType.Button);
return _Buttons.Count - 1;
} }
public int AddSelectSlide(CSelectSlide slide) protected void _AddStatic(CStatic stat, String key = null)
{ {
_SelectSlides.Add(slide); _AddInteraction(_Statics.Add(stat, key), EType.Static);
_AddInteraction(_SelectSlides.Count - 1, EType.SelectSlide);
return _SelectSlides.Count - 1;
} }
#endregion Elements
protected void _AddText(CText text, String key = null)
{
_AddInteraction(_Texts.Add(text, key), EType.Text);
}
protected void _AddSongMenu(CSongMenu songmenu, String key = null)
{
_AddInteraction(_SongMenus.Add(songmenu, key), EType.SongMenu);
}
protected void _AddLyric(CLyric lyric, String key = null)
{
_AddInteraction(_Lyrics.Add(lyric, key), EType.Lyric);
}
protected void _AddSingNote(CSingNotes sn, String key = null)
{
_AddInteraction(_SingNotes.Add(sn, key), EType.SingNote);
}
protected void _AddNameSelection(CNameSelection ns, String key = null)
{
_AddInteraction(_NameSelections.Add(ns, key), EType.NameSelection);
}
protected void _AddEqualizer(CEqualizer eq, String key = null)
{
_AddInteraction(_Equalizers.Add(eq, key), EType.Equalizer);
}
protected void _AddPlaylist(CPlaylist pls, String key = null)
{
_AddInteraction(_Playlists.Add(pls, key), EType.Playlist);
}
protected void _AddParticleEffect(CParticleEffect pe, String key = null)
{
_AddInteraction(_ParticleEffects.Add(pe, key), EType.ParticleEffect);
}
protected void _AddScreenSetting(CScreenSetting se, String key = null)
{
_ScreenSettings.Add(se, key);
}
#endregion Element-Adding
#region InteractionHandling #region InteractionHandling
public void NextInteraction() public void NextInteraction()
@@ -378,9 +396,9 @@ namespace VocaluxeLib.Menu
} }
/// <summary> /// <summary>
/// Selects the next element in a menu interaction. /// Selects the next element in a menu Interaction.
/// </summary> /// </summary>
/// <returns>True if the next element is selected. False if either there is no next element or the interaction does not provide such a method.</returns> /// <returns>True if the next element is selected. False if either there is no next element or the Interaction does not provide such a method.</returns>
public bool NextElement() public bool NextElement()
{ {
if (_Interactions.Count > 0) if (_Interactions.Count > 0)
@@ -390,9 +408,9 @@ namespace VocaluxeLib.Menu
} }
/// <summary> /// <summary>
/// Selects the previous element in a menu interaction. /// Selects the previous element in a menu Interaction.
/// </summary> /// </summary>
/// <returns>True if the previous element is selected. False if either there is no next element or the interaction does not provide such a method.</returns> /// <returns>True if the previous element is selected. False if either there is no next element or the Interaction does not provide such a method.</returns>
public bool PrevElement() public bool PrevElement()
{ {
if (_Interactions.Count > 0) if (_Interactions.Count > 0)
@@ -401,43 +419,43 @@ namespace VocaluxeLib.Menu
return false; return false;
} }
public bool SetInteractionToButton(CButton button) protected void _SetInteractionToButton(CButton button)
{ {
if (!button.Visible)
return;
for (int i = 0; i < _Interactions.Count; i++) for (int i = 0; i < _Interactions.Count; i++)
{ {
if (_Interactions[i].Type == EType.Button) if (_Interactions[i].Type != EType.Button)
{ continue;
if (_Buttons[_Interactions[i].Num].Visible && _Buttons[_Interactions[i].Num] == button) if (_Buttons[_Interactions[i].Num] == button)
{ {
_UnsetSelected(); _UnsetSelected();
_UnsetHighlighted(_Selection); _UnsetHighlighted(_Selection);
_Selection = i; _Selection = i;
_SetSelected(); _SetSelected();
return true; return;
} }
} }
} }
return false;
}
public bool SetInteractionToSelectSlide(CSelectSlide slide) protected void _SetInteractionToSelectSlide(CSelectSlide slide)
{ {
if (!slide.Visible)
return;
for (int i = 0; i < _Interactions.Count; i++) for (int i = 0; i < _Interactions.Count; i++)
{ {
if (_Interactions[i].Type == EType.SelectSlide) if (_Interactions[i].Type != EType.SelectSlide)
{ continue;
if (_SelectSlides[_Interactions[i].Num].Visible && _SelectSlides[_Interactions[i].Num] == slide) if (_SelectSlides[_Interactions[i].Num] == slide)
{ {
_UnsetSelected(); _UnsetSelected();
_UnsetHighlighted(_Selection); _UnsetHighlighted(_Selection);
_Selection = i; _Selection = i;
_SetSelected(); _SetSelected();
return true; return;
} }
} }
} }
return false;
}
public void ProcessMouseClick(int x, int y) public void ProcessMouseClick(int x, int y)
{ {
@@ -453,7 +471,7 @@ namespace VocaluxeLib.Menu
public void ProcessMouseMove(int x, int y) public void ProcessMouseMove(int x, int y)
{ {
SelectByMouse(x, y); _SelectByMouse(x, y);
if (_Selection >= _Interactions.Count || _Selection < 0) if (_Selection >= _Interactions.Count || _Selection < 0)
return; return;
@@ -465,54 +483,46 @@ namespace VocaluxeLib.Menu
} }
} }
public void SelectByMouse(int x, int y) private void _SelectByMouse(int x, int y)
{ {
float z = CBase.Settings.GetZFar(); float z = CBase.Settings.GetZFar();
for (int i = 0; i < _Interactions.Count; i++) for (int i = 0; i < _Interactions.Count; i++)
{ {
if ((CBase.Settings.GetProgramState() == EProgramState.EditTheme) || (!_Interactions[i].ThemeEditorOnly && _IsVisible(i) && _IsEnabled(i))) if ((CBase.Settings.GetProgramState() != EProgramState.EditTheme) && (_Interactions[i].ThemeEditorOnly || !_IsVisible(i) || !_IsEnabled(i)))
{ continue;
if (_IsMouseOver(x, y, _Interactions[i])) if (!_IsMouseOverElement(x, y, _Interactions[i]))
{ continue;
if (_GetZValue(_Interactions[i]) <= z) if (_GetZValue(_Interactions[i]) > z)
{ continue;
z = _GetZValue(_Interactions[i]); z = _GetZValue(_Interactions[i]);
_UnsetSelected(); _UnsetSelected();
_Selection = i; _Selection = i;
_SetSelected(); _SetSelected();
} }
} }
}
}
}
public bool IsMouseOver(SMouseEvent mouseEvent) protected bool _IsMouseOverCurSelection(SMouseEvent mouseEvent)
{ {
return IsMouseOver(mouseEvent.X, mouseEvent.Y); return _IsMouseOverCurSelection(mouseEvent.X, mouseEvent.Y);
} }
public bool IsMouseOver(int x, int y) private bool _IsMouseOverCurSelection(int x, int y)
{ {
if (_Selection >= _Interactions.Count || _Selection < 0) if (_Selection >= _Interactions.Count || _Selection < 0)
return false; return false;
return _Interactions.Count > 0 && _IsMouseOver(x, y, _Interactions[_Selection]); return _Interactions.Count > 0 && _IsMouseOverElement(x, y, _Interactions[_Selection]);
} }
private bool _IsMouseOver(int x, int y, CInteraction interact) private bool _IsMouseOverElement(int x, int y, CInteraction interact)
{ {
switch (interact.Type) bool result = CHelper.IsInBounds(_GetRect(interact), x, y);
if (result)
return true;
if (interact.Type == EType.SelectSlide)
{ {
case EType.Button: return CHelper.IsInBounds(_SelectSlides[interact.Num].RectArrowLeft, x, y) ||
if (CHelper.IsInBounds(_Buttons[interact.Num].Rect, x, y)) CHelper.IsInBounds(_SelectSlides[interact.Num].RectArrowRight, x, y);
return true;
break;
case EType.SelectSlide:
if (CHelper.IsInBounds(_SelectSlides[interact.Num].Rect, x, y) ||
CHelper.IsInBounds(_SelectSlides[interact.Num].RectArrowLeft, x, y) ||
CHelper.IsInBounds(_SelectSlides[interact.Num].RectArrowRight, x, y))
return true;
break;
} }
return false; return false;
} }
@@ -521,33 +531,33 @@ namespace VocaluxeLib.Menu
{ {
switch (interact.Type) switch (interact.Type)
{ {
case EType.Static:
return _Statics[interact.Num].Rect.Z;
case EType.Text:
return _Texts[interact.Num].Z;
case EType.Button: case EType.Button:
return _Buttons[interact.Num].Rect.Z; return _Buttons[interact.Num].Rect.Z;
case EType.SelectSlide: case EType.SelectSlide:
return _SelectSlides[interact.Num].Rect.Z; return _SelectSlides[interact.Num].Rect.Z;
case EType.Static:
return _Statics[interact.Num].Rect.Z;
case EType.SongMenu:
return _SongMenus[interact.Num].Rect.Z;
case EType.Text:
return _Texts[interact.Num].Z;
case EType.Lyric:
return _Lyrics[interact.Num].Rect.Z;
case EType.NameSelection:
return _NameSelections[interact.Num].Rect.Z;
case EType.Equalizer:
return _Equalizers[interact.Num].Rect.Z;
case EType.Playlist:
return _Playlists[interact.Num].Rect.Z;
case EType.ParticleEffect:
return _ParticleEffects[interact.Num].Rect.Z;
} }
return CBase.Settings.GetZFar(); return CBase.Settings.GetZFar();
} }
private float _GetZValue(int interaction) private float _GetZValue(int interaction)
{ {
switch (_Interactions[interaction].Type) return _GetZValue(_Interactions[interaction]);
{
case EType.Static:
return _Statics[_Interactions[interaction].Num].Rect.Z;
case EType.Text:
return _Texts[_Interactions[interaction].Num].Z;
case EType.Button:
return _Buttons[_Interactions[interaction].Num].Rect.Z;
case EType.SelectSlide:
return _SelectSlides[_Interactions[interaction].Num].Rect.Z;
}
return CBase.Settings.GetZFar();
} }
private void _NextInteraction() private void _NextInteraction()
@@ -854,6 +864,30 @@ namespace VocaluxeLib.Menu
case EType.SelectSlide: case EType.SelectSlide:
_SelectSlides[_Interactions[_Selection].Num].Selected = true; _SelectSlides[_Interactions[_Selection].Num].Selected = true;
break; break;
case EType.Static:
_Statics[_Interactions[_Selection].Num].Selected = true;
break;
case EType.Text:
_Texts[_Interactions[_Selection].Num].Selected = true;
break;
case EType.SongMenu:
_SongMenus[_Interactions[_Selection].Num].Selected = true;
break;
case EType.Lyric:
_Lyrics[_Interactions[_Selection].Num].Selected = true;
break;
case EType.NameSelection:
_NameSelections[_Interactions[_Selection].Num].Selected = true;
break;
case EType.Equalizer:
_Equalizers[_Interactions[_Selection].Num].Selected = true;
break;
case EType.Playlist:
_Playlists[_Interactions[_Selection].Num].Selected = true;
break;
case EType.ParticleEffect:
_ParticleEffects[_Interactions[_Selection].Num].Selected = true;
break;
} }
} }
@@ -867,6 +901,30 @@ namespace VocaluxeLib.Menu
case EType.SelectSlide: case EType.SelectSlide:
_SelectSlides[_Interactions[_Selection].Num].Selected = false; _SelectSlides[_Interactions[_Selection].Num].Selected = false;
break; break;
case EType.Static:
_Statics[_Interactions[_Selection].Num].Selected = false;
break;
case EType.Text:
_Texts[_Interactions[_Selection].Num].Selected = false;
break;
case EType.SongMenu:
_SongMenus[_Interactions[_Selection].Num].Selected = false;
break;
case EType.Lyric:
_Lyrics[_Interactions[_Selection].Num].Selected = false;
break;
case EType.NameSelection:
_NameSelections[_Interactions[_Selection].Num].Selected = false;
break;
case EType.Equalizer:
_Equalizers[_Interactions[_Selection].Num].Selected = false;
break;
case EType.Playlist:
_Playlists[_Interactions[_Selection].Num].Selected = false;
break;
case EType.ParticleEffect:
_ParticleEffects[_Interactions[_Selection].Num].Selected = false;
break;
} }
} }
@@ -938,41 +996,42 @@ namespace VocaluxeLib.Menu
} }
} }
private void _ToggleHighlighted()
{
if (_Selection >= _Interactions.Count || _Selection < 0)
return;
if (_Interactions[_Selection].Type == EType.SelectSlide)
_SelectSlides[_Interactions[_Selection].Num].Highlighted = !_SelectSlides[_Interactions[_Selection].Num].Highlighted;
}
private bool _IsHighlighted()
{
if (_Selection >= _Interactions.Count || _Selection < 0)
return false;
if (_Interactions[_Selection].Type == EType.SelectSlide)
return _SelectSlides[_Interactions[_Selection].Num].Highlighted;
return false;
}
private bool _IsVisible(int interaction) private bool _IsVisible(int interaction)
{ {
if (_Selection >= _Interactions.Count || _Selection < 0)
return false;
switch (_Interactions[interaction].Type) switch (_Interactions[interaction].Type)
{ {
case EType.Button:
return _Buttons[_Interactions[interaction].Num].Visible;
case EType.SelectSlide:
return _SelectSlides[_Interactions[interaction].Num].Visible;
case EType.Static: case EType.Static:
return _Statics[_Interactions[interaction].Num].Visible; return _Statics[_Interactions[interaction].Num].Visible;
case EType.Text: case EType.Text:
return _Texts[_Interactions[interaction].Num].Visible; return _Texts[_Interactions[interaction].Num].Visible;
case EType.Button: case EType.SongMenu:
return _Buttons[_Interactions[interaction].Num].Visible; return _SongMenus[_Interactions[interaction].Num].Visible;
case EType.SelectSlide: case EType.Lyric:
return _SelectSlides[_Interactions[interaction].Num].Visible; return _Lyrics[_Interactions[interaction].Num].Visible;
case EType.NameSelection:
return _NameSelections[_Interactions[interaction].Num].Visible;
case EType.Equalizer:
return _Equalizers[_Interactions[interaction].Num].Visible;
case EType.Playlist:
return _Playlists[_Interactions[interaction].Num].Visible;
case EType.ParticleEffect:
return _ParticleEffects[_Interactions[interaction].Num].Visible;
} }
return false; return false;
@@ -980,6 +1039,9 @@ namespace VocaluxeLib.Menu
private bool _IsEnabled(int interaction) private bool _IsEnabled(int interaction)
{ {
if (_Selection >= _Interactions.Count || _Selection < 0)
return false;
switch (_Interactions[interaction].Type) switch (_Interactions[interaction].Type)
{ {
case EType.Button: case EType.Button:
@@ -993,26 +1055,73 @@ namespace VocaluxeLib.Menu
case EType.Text: case EType.Text:
return false; //_Texts[_Interactions[interaction].Num].Visible; return false; //_Texts[_Interactions[interaction].Num].Visible;
case EType.SongMenu:
return _SongMenus[_Interactions[interaction].Num].Visible;
case EType.Lyric:
return false; //_Lyrics[_Interactions[interaction].Num].Visible;
case EType.NameSelection:
return _NameSelections[_Interactions[interaction].Num].Visible;
case EType.Equalizer:
return false; //_Equalizers[_Interactions[interaction].Num].Visible;
case EType.Playlist:
return _Playlists[_Interactions[interaction].Num].Visible;
case EType.ParticleEffect:
return false; //_ParticleEffects[_Interactions[interaction].Num].Visible;
} }
return false; return false;
} }
private SRectF _GetRect(int interaction) private SRectF _GetRect(CInteraction interaction)
{ {
var result = new SRectF(); var result = new SRectF();
switch (_Interactions[interaction].Type) switch (interaction.Type)
{ {
case EType.Button: case EType.Button:
return _Buttons[_Interactions[interaction].Num].Rect; return _Buttons[interaction.Num].Rect;
case EType.SelectSlide: case EType.SelectSlide:
return _SelectSlides[_Interactions[interaction].Num].Rect; return _SelectSlides[interaction.Num].Rect;
case EType.Static:
return _Statics[interaction.Num].Rect;
case EType.Text:
return _Texts[interaction.Num].Rect;
case EType.SongMenu:
return _SongMenus[interaction.Num].Rect;
case EType.Lyric:
return _Lyrics[interaction.Num].Rect;
case EType.NameSelection:
return _NameSelections[interaction.Num].Rect;
case EType.Equalizer:
return _Equalizers[interaction.Num].Rect;
case EType.Playlist:
return _Playlists[interaction.Num].Rect;
case EType.ParticleEffect:
return _ParticleEffects[interaction.Num].Rect;
} }
return result; return result;
} }
private SRectF _GetRect(int interaction)
{
return _GetRect(_Interactions[interaction]);
}
private void _AddInteraction(int num, EType type) private void _AddInteraction(int num, EType type)
{ {
_Interactions.Add(new CInteraction(num, type)); _Interactions.Add(new CInteraction(num, type));
@@ -1024,9 +1133,16 @@ namespace VocaluxeLib.Menu
private void _DrawInteraction(int interaction) private void _DrawInteraction(int interaction)
{ {
bool sel;
switch (_Interactions[interaction].Type) switch (_Interactions[interaction].Type)
{ {
case EType.Button:
_Buttons[_Interactions[interaction].Num].Draw();
break;
case EType.SelectSlide:
_SelectSlides[_Interactions[interaction].Num].Draw();
break;
case EType.Static: case EType.Static:
_Statics[_Interactions[interaction].Num].Draw(); _Statics[_Interactions[interaction].Num].Draw();
break; break;
@@ -1035,21 +1151,35 @@ namespace VocaluxeLib.Menu
_Texts[_Interactions[interaction].Num].Draw(); _Texts[_Interactions[interaction].Num].Draw();
break; break;
case EType.Button: case EType.SongMenu:
sel = _Buttons[_Interactions[interaction].Num].Selected; _SongMenus[_Interactions[interaction].Num].Draw();
if (!Active)
_Buttons[_Interactions[interaction].Num].Selected = false;
_Buttons[_Interactions[interaction].Num].Draw();
_Buttons[_Interactions[interaction].Num].Selected = sel;
break; break;
case EType.SelectSlide: case EType.NameSelection:
sel = _SelectSlides[_Interactions[interaction].Num].Selected; _NameSelections[_Interactions[interaction].Num].Draw();
if (!Active)
_SelectSlides[_Interactions[interaction].Num].Selected = false;
_SelectSlides[_Interactions[interaction].Num].Draw();
_SelectSlides[_Interactions[interaction].Num].Selected = sel;
break; break;
case EType.Equalizer:
if (!_Equalizers[_Interactions[interaction].Num].ScreenHandles)
{
//TODO:
//Call Update-Method of Equalizer and give infos about bg-sound.
//_Equalizers[_Interactions[interaction].Num].Draw();
}
break;
case EType.Playlist:
_Playlists[_Interactions[interaction].Num].Draw();
break;
case EType.ParticleEffect:
_ParticleEffects[_Interactions[interaction].Num].Draw();
break;
//TODO:
//case EType.TLyric:
// _Lyrics[_Interactions[interaction].Num].Draw(0);
// break;
} }
} }
#endregion InteractionHandling #endregion InteractionHandling
@@ -1057,8 +1187,8 @@ namespace VocaluxeLib.Menu
#region Theme Handling #region Theme Handling
private void _MoveElement(int stepX, int stepY) private void _MoveElement(int stepX, int stepY)
{ {
if (_Interactions.Count > 0) if (_Interactions.Count <= 0)
{ return;
switch (_Interactions[_Selection].Type) switch (_Interactions[_Selection].Type)
{ {
case EType.Button: case EType.Button:
@@ -1068,14 +1198,45 @@ namespace VocaluxeLib.Menu
case EType.SelectSlide: case EType.SelectSlide:
_SelectSlides[_Interactions[_Selection].Num].MoveElement(stepX, stepY); _SelectSlides[_Interactions[_Selection].Num].MoveElement(stepX, stepY);
break; break;
}
case EType.Static:
_Statics[_Interactions[_Selection].Num].MoveElement(stepX, stepY);
break;
case EType.Text:
_Texts[_Interactions[_Selection].Num].MoveElement(stepX, stepY);
break;
case EType.SongMenu:
_SongMenus[_Interactions[_Selection].Num].MoveElement(stepX, stepY);
break;
case EType.Lyric:
_Lyrics[_Interactions[_Selection].Num].MoveElement(stepX, stepY);
break;
case EType.NameSelection:
_NameSelections[_Interactions[_Selection].Num].MoveElement(stepX, stepY);
break;
case EType.Equalizer:
_Equalizers[_Interactions[_Selection].Num].MoveElement(stepX, stepY);
break;
case EType.Playlist:
_Playlists[_Interactions[_Selection].Num].MoveElement(stepX, stepY);
break;
case EType.ParticleEffect:
_ParticleEffects[_Interactions[_Selection].Num].MoveElement(stepX, stepY);
break;
} }
} }
private void _ResizeElement(int stepW, int stepH) private void _ResizeElement(int stepW, int stepH)
{ {
if (_Interactions.Count > 0) if (_Interactions.Count <= 0)
{ return;
switch (_Interactions[_Selection].Type) switch (_Interactions[_Selection].Type)
{ {
case EType.Button: case EType.Button:
@@ -1085,7 +1246,38 @@ namespace VocaluxeLib.Menu
case EType.SelectSlide: case EType.SelectSlide:
_SelectSlides[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); _SelectSlides[_Interactions[_Selection].Num].ResizeElement(stepW, stepH);
break; break;
}
case EType.Static:
_Statics[_Interactions[_Selection].Num].ResizeElement(stepW, stepH);
break;
case EType.Text:
_Texts[_Interactions[_Selection].Num].ResizeElement(stepW, stepH);
break;
case EType.SongMenu:
_SongMenus[_Interactions[_Selection].Num].ResizeElement(stepW, stepH);
break;
case EType.Lyric:
_Lyrics[_Interactions[_Selection].Num].ResizeElement(stepW, stepH);
break;
case EType.NameSelection:
_NameSelections[_Interactions[_Selection].Num].ResizeElement(stepW, stepH);
break;
case EType.Equalizer:
_Equalizers[_Interactions[_Selection].Num].ResizeElement(stepW, stepH);
break;
case EType.Playlist:
_Playlists[_Interactions[_Selection].Num].ResizeElement(stepW, stepH);
break;
case EType.ParticleEffect:
_ParticleEffects[_Interactions[_Selection].Num].ResizeElement(stepW, stepH);
break;
} }
} }
#endregion Theme Handling #endregion Theme Handling
+6 -4
View File
@@ -25,13 +25,15 @@ namespace VocaluxeLib.Menu
{ {
private readonly List<T> _Items; private readonly List<T> _Items;
private readonly Dictionary<String, int> _HtIndex; private readonly Dictionary<String, int> _HtIndex;
private readonly CMenu _Parent; private readonly String _ParentName;
public COrderedDictionaryLite(CMenu parent) public COrderedDictionaryLite(object parent)
{ {
_Items = new List<T>(); _Items = new List<T>();
_HtIndex = new Dictionary<String, int>(); _HtIndex = new Dictionary<String, int>();
_Parent = parent; _ParentName = parent.GetType().Name;
if (_ParentName[0] == 'C' && Char.IsUpper(_ParentName[1]))
_ParentName = _ParentName.Remove(0, 1);
} }
public T this[int index] public T this[int index]
@@ -50,7 +52,7 @@ namespace VocaluxeLib.Menu
} }
catch (Exception) catch (Exception)
{ {
CBase.Log.LogError("Can't find " + typeof(T).Name.Substring(1) + " Element \"" + key + "\" in Screen " + _Parent.ThemeName); CBase.Log.LogError("Can't find " + typeof(T).Name.Substring(1) + " Element \"" + key + "\" in " + _ParentName);
throw; throw;
} }
} }
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -71,7 +71,7 @@ namespace VocaluxeLib.PartyModes
{ {
base.HandleMouse(mouseEvent); base.HandleMouse(mouseEvent);
if (mouseEvent.LB && _IsMouseOver(mouseEvent)) {} if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent)) {}
if (mouseEvent.RB) if (mouseEvent.RB)
_FadeTo(EScreens.ScreenParty); _FadeTo(EScreens.ScreenParty);