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

Removed unused method overrides

Browse Source 
renamed some parameter casings
This commit is contained in:
Flamefire committed 2013-03-22 22:16:51 +01:00
1 parent 36847b88ab
commit d047b12415
32 files changed
+349 -404
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/CMenu.cs
+21 -21
View File
@@ -589,64 +589,64 @@ namespace VocaluxeLib.Menu
#endregion ElementHandler
#region MenuHandler
public virtual bool HandleInput(KeyEvent KeyEvent)
public virtual bool HandleInput(KeyEvent keyEvent)
{
if (!CBase.Settings.IsTabNavigation())
{
if (KeyEvent.Key == Keys.Left)
if (keyEvent.Key == Keys.Left)
{
if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.TSelectSlide && KeyEvent.Mod != EModifier.Shift)
KeyEvent.Handled = PrevElement();
if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.TSelectSlide && keyEvent.Mod != EModifier.Shift)
keyEvent.Handled = PrevElement();
else
KeyEvent.Handled = _NextInteraction(KeyEvent);
keyEvent.Handled = _NextInteraction(keyEvent);
}
if (KeyEvent.Key == Keys.Right)
if (keyEvent.Key == Keys.Right)
{
if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.TSelectSlide && KeyEvent.Mod != EModifier.Shift)
KeyEvent.Handled = NextElement();
if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.TSelectSlide && keyEvent.Mod != EModifier.Shift)
keyEvent.Handled = NextElement();
else
KeyEvent.Handled = _NextInteraction(KeyEvent);
keyEvent.Handled = _NextInteraction(keyEvent);
}
if (KeyEvent.Key == Keys.Up || KeyEvent.Key == Keys.Down)
KeyEvent.Handled = _NextInteraction(KeyEvent);
if (keyEvent.Key == Keys.Up || keyEvent.Key == Keys.Down)
keyEvent.Handled = _NextInteraction(keyEvent);
}
else
{
if (KeyEvent.Key == Keys.Tab)
if (keyEvent.Key == Keys.Tab)
{
if (KeyEvent.Mod == EModifier.Shift)
if (keyEvent.Mod == EModifier.Shift)
PrevInteraction();
else
NextInteraction();
}
if (KeyEvent.Key == Keys.Left)
if (keyEvent.Key == Keys.Left)
PrevElement();
if (KeyEvent.Key == Keys.Right)
if (keyEvent.Key == Keys.Right)
NextElement();
}
return true;
}
public virtual bool HandleMouse(MouseEvent MouseEvent)
public virtual bool HandleMouse(MouseEvent mouseEvent)
{
int selection = _Selection;
ProcessMouseMove(MouseEvent.X, MouseEvent.Y);
ProcessMouseMove(mouseEvent.X, mouseEvent.Y);
if (selection != _Selection)
{
_UnsetHighlighted(selection);
_SetHighlighted(_Selection);
}
if (MouseEvent.LB)
ProcessMouseClick(MouseEvent.X, MouseEvent.Y);
if (mouseEvent.LB)
ProcessMouseClick(mouseEvent.X, mouseEvent.Y);
_PrevMouseX = MouseEvent.X;
_PrevMouseY = MouseEvent.Y;
_PrevMouseX = mouseEvent.X;
_PrevMouseY = mouseEvent.Y;
return true;
}
VocaluxeLib/Menu/IMenu.cs
+2 -2
View File
@@ -18,8 +18,8 @@ namespace VocaluxeLib.Menu
void UnloadTextures();
void ReloadTheme(string XmlPath);
bool HandleInput(KeyEvent KeyEvent);
bool HandleMouse(MouseEvent MouseEvent);
bool HandleInput(KeyEvent keyEvent);
bool HandleMouse(MouseEvent mouseEvent);
bool HandleInputThemeEditor(KeyEvent KeyEvent);
bool HandleMouseThemeEditor(MouseEvent MouseEvent);
VocaluxeLib/PartyModes/CScreenPartyDummy.cs
+8 -8
View File
@@ -34,14 +34,14 @@ namespace VocaluxeLib.PartyModes
public override void UnloadTextures() {}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Back:
case Keys.Escape:
@@ -52,13 +52,13 @@ namespace VocaluxeLib.PartyModes
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.LB && IsMouseOver(MouseEvent)) {}
if (mouseEvent.LB && IsMouseOver(mouseEvent)) {}
if (MouseEvent.RB)
if (mouseEvent.RB)
FadeTo(EScreens.ScreenParty);
return true;