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

some code reorganization

Browse Source
This commit is contained in:
Alexander Eckart committed 2013-02-22 21:27:34 +01:00
1 parent a29f4fb0d6
commit 521033ed97
41 files changed
+836 -842
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/CObjectInteractions.cs
+11 -11
View File
@@ -59,7 +59,7 @@ namespace Vocaluxe.Menu
_MouseDY = 0;
Active = false;
_ScreenArea = new SRectF(0f, 0f, CBase.Base.Settings.GetRenderW(), CBase.Base.Settings.GetRenderH(), 0f);
_ScreenArea = new SRectF(0f, 0f, CBase.Settings.GetRenderW(), CBase.Settings.GetRenderH(), 0f);
}
public void Clear()
@@ -115,7 +115,7 @@ namespace Vocaluxe.Menu
#region MenuHandler
public bool HandleInput(KeyEvent KeyEvent)
{
if (!CBase.Base.Settings.IsTabNavigation())
if (!CBase.Settings.IsTabNavigation())
{
if (KeyEvent.Key == Keys.Left)
{
@@ -189,7 +189,7 @@ namespace Vocaluxe.Menu
switch (KeyEvent.Key)
{
case Keys.S:
CBase.Base.Graphics.SaveTheme();
CBase.Graphics.SaveTheme();
break;
case Keys.Up:
@@ -474,10 +474,10 @@ namespace Vocaluxe.Menu
public void SelectByMouse(int x, int y)
{
float z = CBase.Base.Settings.GetZFar();
float z = CBase.Settings.GetZFar();
for (int i = 0; i < _Interactions.Count; i++)
{
if ((CBase.Base.Settings.GetGameState() == EGameState.EditTheme) || (!_Interactions[i].ThemeEditorOnly && _IsVisible(i) && _IsEnabled(i)))
if ((CBase.Settings.GetGameState() == EGameState.EditTheme) || (!_Interactions[i].ThemeEditorOnly && _IsVisible(i) && _IsEnabled(i)))
{
if (_IsMouseOver(x, y, _Interactions[i]))
{
@@ -540,7 +540,7 @@ namespace Vocaluxe.Menu
case EType.TSelectSlide:
return _SelectSlides[interact.Num].Rect.Z;
}
return CBase.Base.Settings.GetZFar();
return CBase.Settings.GetZFar();
}
private float _GetZValue(int interaction)
@@ -557,13 +557,13 @@ namespace Vocaluxe.Menu
return _SelectSlides[_Interactions[interaction].Num].Rect.Z;
}
return CBase.Base.Settings.GetZFar();
return CBase.Settings.GetZFar();
}
private void _NextInteraction()
{
_UnsetSelected();
if (CBase.Base.Settings.GetGameState() != EGameState.EditTheme)
if (CBase.Settings.GetGameState() != EGameState.EditTheme)
{
bool found = false;
int start = _Selection;
@@ -590,7 +590,7 @@ namespace Vocaluxe.Menu
private void _PrevInteraction()
{
_UnsetSelected();
if (CBase.Base.Settings.GetGameState() != EGameState.EditTheme)
if (CBase.Settings.GetGameState() != EGameState.EditTheme)
{
bool found = false;
int start = _Selection;
@@ -737,13 +737,13 @@ namespace Vocaluxe.Menu
switch (Key.Key)
{
case Keys.Up:
actualRect = new SRectF(actualRect.X, CBase.Base.Settings.GetRenderH(), 1, 1, actualRect.Z);
actualRect = new SRectF(actualRect.X, CBase.Settings.GetRenderH(), 1, 1, actualRect.Z);
break;
case Keys.Down:
actualRect = new SRectF(actualRect.X, 0, 1, 1, actualRect.Z);
break;
case Keys.Left:
actualRect = new SRectF(CBase.Base.Settings.GetRenderW(), actualRect.Y, 1, 1, actualRect.Z);
actualRect = new SRectF(CBase.Settings.GetRenderW(), actualRect.Y, 1, 1, actualRect.Z);
break;
case Keys.Right:
actualRect = new SRectF(0, actualRect.Y, 1, 1, actualRect.Z);