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

Remove some bogosity from widget mouse handling.

Browse Source
This commit is contained in:
Paul Chote
2011-01-05 23:01:17 +13:00
parent df460d7407
commit 5254deedcb
13 changed files with 63 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
View File

@@ -157,7 +157,8 @@ namespace OpenRA.Mods.RA.Widgets
return DoBuildingHotkey(Char.ToLowerInvariant(e.KeyChar), world);
}
public override bool HandleInputInner(MouseInput mi)
// TODO: BuildPaletteWidget doesn't support delegate methods for mouse input
public override bool HandleMouseInput(MouseInput mi)
{
if (mi.Event != MouseInputEvent.Down)
return false;

8
OpenRA.Mods.RA/Widgets/RadarBinWidget.cs
View File

@@ -84,7 +84,8 @@ namespace OpenRA.Mods.RA.Widgets
return CursorProvider.HasCursorSequence(cursor+"-minimap") ? cursor+"-minimap" : cursor;
}
public override bool HandleInputInner(MouseInput mi)
// TODO: RadarBinWidget doesn't support delegate methods for mouse input
public override bool HandleMouseInput(MouseInput mi)
{
if (!hasRadar || radarAnimating) return false; // we're not set up for this.
@@ -98,7 +99,6 @@ namespace OpenRA.Mods.RA.Widgets
if (mi.Event == MouseInputEvent.Down && mi.Button == MouseButton.Right)
{
// fake a mousedown/mouseup here
var fakemi = new MouseInput
{
Event = MouseInputEvent.Down,
@@ -110,9 +110,9 @@ namespace OpenRA.Mods.RA.Widgets
if (WorldInteractionController != null)
{
var controller = Widget.RootWidget.GetWidget<WorldInteractionControllerWidget>(WorldInteractionController);
controller.HandleInputInner(fakemi);
controller.HandleMouseInput(fakemi);
fakemi.Event = MouseInputEvent.Up;
controller.HandleInputInner(fakemi);
controller.HandleMouseInput(fakemi);
}
}

3
OpenRA.Mods.RA/Widgets/SpecialPowerBinWidget.cs
View File

@@ -53,7 +53,8 @@ namespace OpenRA.Mods.RA.Widgets
get { return buttons.Any() ? buttons.Select(b => b.First).Aggregate(Rectangle.Union) : Bounds; }
}
public override bool HandleInputInner(MouseInput mi)
// TODO: SpecialPowerBin doesn't support delegate methods for mouse input
public override bool HandleMouseInput(MouseInput mi)
{
if (mi.Event == MouseInputEvent.Down)
{