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

refactor mouse position label hooking for Surface

Browse Source
This commit is contained in:
Chris Forbes
2010-11-02 11:16:30 +13:00
parent 40126c52e8
commit 4aa1fb4b86
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Editor/Form1.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Editor
Rules.LoadRules(Game.modData.Manifest, new Map()); Rules.LoadRules(Game.modData.Manifest, new Map());
surface1.AfterChange += OnMapChanged; surface1.AfterChange += OnMapChanged;
surface1.SetMousePositionLabel(toolStripStatusLabelMousePosition); surface1.MousePositionChanged += s => toolStripStatusLabelMousePosition.Text = s;
} }
void OnMapChanged() void OnMapChanged()

14
OpenRA.Editor/Surface.cs
View File

@@ -35,8 +35,7 @@ namespace OpenRA.Editor
public bool IsPanning; public bool IsPanning;
public event Action AfterChange = () => { }; public event Action AfterChange = () => { };
public event Action<string> MousePositionChanged = _ => { };
private ToolStripStatusLabel MousePositionLabel = null;
Dictionary<string, ActorTemplate> ActorTemplates = new Dictionary<string, ActorTemplate>(); Dictionary<string, ActorTemplate> ActorTemplates = new Dictionary<string, ActorTemplate>();
Dictionary<int, ResourceTemplate> ResourceTemplates = new Dictionary<int, ResourceTemplate>(); Dictionary<int, ResourceTemplate> ResourceTemplates = new Dictionary<int, ResourceTemplate>();
@@ -87,11 +86,6 @@ namespace OpenRA.Editor
Invalidate(); Invalidate();
} }
public void SetMousePositionLabel(ToolStripStatusLabel mouseLabel)
{
MousePositionLabel = mouseLabel;
}
protected override void OnMouseWheel(MouseEventArgs e) protected override void OnMouseWheel(MouseEventArgs e)
{ {
base.OnMouseWheel(e); base.OnMouseWheel(e);
@@ -129,11 +123,7 @@ namespace OpenRA.Editor
var oldMousePos = MousePos; var oldMousePos = MousePos;
MousePos = new int2(e.Location); MousePos = new int2(e.Location);
MousePositionChanged(GetBrushLocation().ToString());
if (MousePositionLabel != null)
{
MousePositionLabel.Text = GetBrushLocation().ToString();
}
if (e.Button == MouseButtons.Middle || (e.Button != MouseButtons.None && IsPanning)) if (e.Button == MouseButtons.Middle || (e.Button != MouseButtons.None && IsPanning))
Scroll(oldMousePos - MousePos); Scroll(oldMousePos - MousePos);