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

Move OnMouseUp onto ButtonWidget and drop its unnecessary plumbing.

Browse Source
This commit is contained in:
Paul Chote
2011-07-04 02:52:37 +12:00
parent 8189ef109e
commit 193999a040
16 changed files with 95 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,7 +117,6 @@ namespace OpenRA.Widgets
public Func<bool> IsVisible;
public Widget() { IsVisible = () => Visible; }
protected readonly List<Widget> Children = new List<Widget>();
public Func<MouseInput,bool> OnMouseUp = _ => false;
public Widget(Widget widget)
{
@@ -132,8 +131,6 @@ namespace OpenRA.Widgets
Bounds = widget.Bounds;
Parent = widget.Parent;
OnMouseUp = widget.OnMouseUp;
IsVisible = widget.IsVisible;
foreach (var child in widget.Children)
@@ -269,16 +266,7 @@ namespace OpenRA.Widgets
return HandleMouseInput(mi);
}
// Hack: Don't eat mouse input that others want
// TODO: Solve this properly
public virtual bool HandleMouseInput(MouseInput mi)
{
// Apply any special logic added by event handlers; they return true if they caught the input
if (mi.Event == MouseInputEvent.Up && OnMouseUp(mi)) return true;
return false;
}
public virtual bool HandleMouseInput(MouseInput mi) { return false; }
public virtual bool HandleKeyPressInner(KeyInput e) { return false; }
public virtual bool HandleKeyPressOuter(KeyInput e)
{