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

Tidy MapEditorLogic ctor.

Browse Source
This commit is contained in:
Paul Chote
2020-08-14 14:18:24 +01:00
committed by reaperrr
parent 960056d300
commit 6e73d7f5c2
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs
View File

@@ -28,10 +28,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var editorViewport = widget.Get<EditorViewportControllerWidget>("MAP_EDITOR"); var editorViewport = widget.Get<EditorViewportControllerWidget>("MAP_EDITOR");
var gridButton = widget.GetOrNull<ButtonWidget>("GRID_BUTTON"); var gridButton = widget.GetOrNull<ButtonWidget>("GRID_BUTTON");
var terrainGeometryTrait = world.WorldActor.Trait<TerrainGeometryOverlay>(); if (gridButton != null)
if (gridButton != null && terrainGeometryTrait != null)
{ {
var terrainGeometryTrait = world.WorldActor.Trait<TerrainGeometryOverlay>();
gridButton.OnClick = () => terrainGeometryTrait.Enabled ^= true; gridButton.OnClick = () => terrainGeometryTrait.Enabled ^= true;
gridButton.IsHighlighted = () => terrainGeometryTrait.Enabled; gridButton.IsHighlighted = () => terrainGeometryTrait.Enabled;
} }
@@ -80,17 +79,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
cashLabel.GetText = () => "$ {0}".F(reslayer.NetWorth); cashLabel.GetText = () => "$ {0}".F(reslayer.NetWorth);
} }
var actionManager = world.WorldActor.Trait<EditorActionManager>();
var undoButton = widget.GetOrNull<ButtonWidget>("UNDO_BUTTON"); var undoButton = widget.GetOrNull<ButtonWidget>("UNDO_BUTTON");
if (undoButton != null) var redoButton = widget.GetOrNull<ButtonWidget>("REDO_BUTTON");
if (undoButton != null && redoButton != null)
{ {
var actionManager = world.WorldActor.Trait<EditorActionManager>();
undoButton.IsDisabled = () => !actionManager.HasUndos(); undoButton.IsDisabled = () => !actionManager.HasUndos();
undoButton.OnClick = () => actionManager.Undo(); undoButton.OnClick = () => actionManager.Undo();
}
var redoButton = widget.GetOrNull<ButtonWidget>("REDO_BUTTON");
if (redoButton != null)
{
redoButton.IsDisabled = () => !actionManager.HasRedos(); redoButton.IsDisabled = () => !actionManager.HasRedos();
redoButton.OnClick = () => actionManager.Redo(); redoButton.OnClick = () => actionManager.Redo();
} }