epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Widget.OnMouseMove.

Browse Source
This commit is contained in:
Paul Chote
2011-07-04 01:51:38 +12:00
parent f905c87b97
commit 7a69daa99c
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Widgets/ButtonWidget.cs
View File

@@ -89,15 +89,9 @@ namespace OpenRA.Widgets
else else
LoseFocus(mi); LoseFocus(mi);
} }
else if (mi.Event == MouseInputEvent.Move && Focused) else if (mi.Event == MouseInputEvent.Move && Focused)
{
Depressed = RenderBounds.Contains(mi.Location.X, mi.Location.Y); Depressed = RenderBounds.Contains(mi.Location.X, mi.Location.Y);
// All widgets should receive MouseMove events
OnMouseMove(mi);
}
return Depressed; return Depressed;
} }

4
OpenRA.Game/Widgets/Widget.cs
View File

@@ -40,7 +40,6 @@ namespace OpenRA.Widgets
// Common Funcs that most widgets will want // Common Funcs that most widgets will want
public Func<MouseInput, bool> OnMouseDown = mi => false; public Func<MouseInput, bool> OnMouseDown = mi => false;
public Func<MouseInput, bool> OnMouseUp = mi => false; public Func<MouseInput, bool> OnMouseUp = mi => false;
public Action<MouseInput> OnMouseMove = mi => { };
public Func<bool> IsVisible; public Func<bool> IsVisible;
@@ -68,7 +67,6 @@ namespace OpenRA.Widgets
OnMouseDown = widget.OnMouseDown; OnMouseDown = widget.OnMouseDown;
OnMouseUp = widget.OnMouseUp; OnMouseUp = widget.OnMouseUp;
OnMouseMove = widget.OnMouseMove;
IsVisible = widget.IsVisible; IsVisible = widget.IsVisible;
@@ -230,8 +228,6 @@ namespace OpenRA.Widgets
// Apply any special logic added by event handlers; they return true if they caught the input // Apply any special logic added by event handlers; they return true if they caught the input
if (mi.Event == MouseInputEvent.Down && OnMouseDown(mi)) return true; if (mi.Event == MouseInputEvent.Down && OnMouseDown(mi)) return true;
if (mi.Event == MouseInputEvent.Up && OnMouseUp(mi)) return true; if (mi.Event == MouseInputEvent.Up && OnMouseUp(mi)) return true;
if (mi.Event == MouseInputEvent.Move)
OnMouseMove(mi);
return false; return false;
} }