From 2465344a2085412df50b3d32e12ded0e9eb210af Mon Sep 17 00:00:00 2001 From: teees Date: Tue, 3 Nov 2015 12:45:14 +0100 Subject: [PATCH] only change editor brushes on mouseup let other uses of the right mouse button bubble up --- OpenRA.Mods.Common/EditorBrushes/EditorActorBrush.cs | 9 +++++++-- OpenRA.Mods.Common/EditorBrushes/EditorResourceBrush.cs | 9 +++++++-- OpenRA.Mods.Common/EditorBrushes/EditorTileBrush.cs | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/OpenRA.Mods.Common/EditorBrushes/EditorActorBrush.cs b/OpenRA.Mods.Common/EditorBrushes/EditorActorBrush.cs index fc7c7b483c..9b2d5a5c98 100644 --- a/OpenRA.Mods.Common/EditorBrushes/EditorActorBrush.cs +++ b/OpenRA.Mods.Common/EditorBrushes/EditorActorBrush.cs @@ -89,8 +89,13 @@ namespace OpenRA.Mods.Common.Widgets if (mi.Button == MouseButton.Right) { - editorWidget.ClearBrush(); - return true; + if (mi.Event == MouseInputEvent.Up) + { + editorWidget.ClearBrush(); + return true; + } + + return false; } var cell = worldRenderer.Viewport.ViewToWorld(mi.Location); diff --git a/OpenRA.Mods.Common/EditorBrushes/EditorResourceBrush.cs b/OpenRA.Mods.Common/EditorBrushes/EditorResourceBrush.cs index 965d4285c6..d6182e68a6 100644 --- a/OpenRA.Mods.Common/EditorBrushes/EditorResourceBrush.cs +++ b/OpenRA.Mods.Common/EditorBrushes/EditorResourceBrush.cs @@ -64,8 +64,13 @@ namespace OpenRA.Mods.Common.Widgets if (mi.Button == MouseButton.Right) { - editorWidget.ClearBrush(); - return true; + if (mi.Event == MouseInputEvent.Up) + { + editorWidget.ClearBrush(); + return true; + } + + return false; } var cell = worldRenderer.Viewport.ViewToWorld(mi.Location); diff --git a/OpenRA.Mods.Common/EditorBrushes/EditorTileBrush.cs b/OpenRA.Mods.Common/EditorBrushes/EditorTileBrush.cs index c5f288c571..e0698219ad 100644 --- a/OpenRA.Mods.Common/EditorBrushes/EditorTileBrush.cs +++ b/OpenRA.Mods.Common/EditorBrushes/EditorTileBrush.cs @@ -64,8 +64,13 @@ namespace OpenRA.Mods.Common.Widgets if (mi.Button == MouseButton.Right) { - editorWidget.ClearBrush(); - return true; + if (mi.Event == MouseInputEvent.Up) + { + editorWidget.ClearBrush(); + return true; + } + + return false; } if (mi.Button == MouseButton.Left)