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

Merge pull request #9873 from teees/editor-fix

Browse Source 
Handle mouse up event in default editor brush (instead of mouse down)
This commit is contained in:
Paul Chote
2015-11-08 11:29:03 +00:00
parent 9ef708b3df 2465344a20
commit 101efaed4f
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/EditorBrushes/EditorActorBrush.cs
View File

@@ -89,8 +89,13 @@ namespace OpenRA.Mods.Common.Widgets
if (mi.Button == MouseButton.Right) if (mi.Button == MouseButton.Right)
{ {
editorWidget.ClearBrush(); if (mi.Event == MouseInputEvent.Up)
return true; {
editorWidget.ClearBrush();
return true;
}
return false;
} }
var cell = worldRenderer.Viewport.ViewToWorld(mi.Location); var cell = worldRenderer.Viewport.ViewToWorld(mi.Location);

5
OpenRA.Mods.Common/EditorBrushes/EditorDefaultBrush.cs
View File

@@ -55,12 +55,11 @@ namespace OpenRA.Mods.Common.Widgets
{ {
// Exclusively uses mouse wheel and right mouse buttons, but nothing else // Exclusively uses mouse wheel and right mouse buttons, but nothing else
// Mouse move events are important for tooltips, so we always allow these through // Mouse move events are important for tooltips, so we always allow these through
if (mi.Button != MouseButton.Right && mi.Event != MouseInputEvent.Move && mi.Event != MouseInputEvent.Scroll) if ((mi.Button != MouseButton.Right && mi.Event != MouseInputEvent.Move && mi.Event != MouseInputEvent.Scroll) ||
mi.Event == MouseInputEvent.Down)
return false; return false;
var cell = worldRenderer.Viewport.ViewToWorld(mi.Location); var cell = worldRenderer.Viewport.ViewToWorld(mi.Location);
if (mi.Event == MouseInputEvent.Up)
return true;
var underCursor = editorLayer.PreviewsAt(worldRenderer.Viewport.ViewToWorldPx(mi.Location)) var underCursor = editorLayer.PreviewsAt(worldRenderer.Viewport.ViewToWorldPx(mi.Location))
.FirstOrDefault(); .FirstOrDefault();

9
OpenRA.Mods.Common/EditorBrushes/EditorResourceBrush.cs
View File

@@ -64,8 +64,13 @@ namespace OpenRA.Mods.Common.Widgets
if (mi.Button == MouseButton.Right) if (mi.Button == MouseButton.Right)
{ {
editorWidget.ClearBrush(); if (mi.Event == MouseInputEvent.Up)
return true; {
editorWidget.ClearBrush();
return true;
}
return false;
} }
var cell = worldRenderer.Viewport.ViewToWorld(mi.Location); var cell = worldRenderer.Viewport.ViewToWorld(mi.Location);

9
OpenRA.Mods.Common/EditorBrushes/EditorTileBrush.cs
View File

@@ -64,8 +64,13 @@ namespace OpenRA.Mods.Common.Widgets
if (mi.Button == MouseButton.Right) if (mi.Button == MouseButton.Right)
{ {
editorWidget.ClearBrush(); if (mi.Event == MouseInputEvent.Up)
return true; {
editorWidget.ClearBrush();
return true;
}
return false;
} }
if (mi.Button == MouseButton.Left) if (mi.Button == MouseButton.Left)