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

Polish up UI

Browse Source
This commit is contained in:
Gustas
2024-09-15 17:59:36 +03:00
committed by Paul Chote
parent 251680056d
commit b09c4f3770
5 changed files with 203 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/Logic/Editor/ActorEditLogic.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly EditorActorLayer editorActorLayer;
readonly EditorActionManager editorActionManager;
readonly EditorViewportControllerWidget editor;
readonly ContainerWidget actorEditPanel;
readonly Widget actorEditPanel;
readonly LabelWidget typeLabel;
readonly TextFieldWidget actorIDField;
readonly HashSet<TextFieldWidget> typableFields = new();
@@ -72,8 +72,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
editor = widget.Parent.Parent.Get<EditorViewportControllerWidget>("MAP_EDITOR");
editor.DefaultBrush.SelectionChanged += HandleSelectionChanged;
var selectTabContainer = widget.Parent.Parent.Get<ContainerWidget>("SELECT_WIDGETS");
actorEditPanel = selectTabContainer.Get<ContainerWidget>("ACTOR_EDIT_PANEL");
var selectTabContainer = widget.Parent.Parent.Get("SELECT_WIDGETS");
actorEditPanel = selectTabContainer.Get("ACTOR_EDIT_PANEL");
typeLabel = actorEditPanel.Get<LabelWidget>("ACTOR_TYPE_LABEL");
actorIDField = actorEditPanel.Get<TextFieldWidget>("ACTOR_ID");

4
OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorSelectionLogic.cs
View File

@@ -49,8 +49,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
editor = widget.Get<EditorViewportControllerWidget>("MAP_EDITOR");
editor.DefaultBrush.SelectionChanged += HandleSelectionChanged;
var selectTabContainer = widget.Get("SELECT_WIDGETS");
var actorEditPanel = selectTabContainer.Get<ContainerWidget>("ACTOR_EDIT_PANEL");
var areaEditPanel = selectTabContainer.Get<ContainerWidget>("AREA_EDIT_PANEL");
var actorEditPanel = selectTabContainer.Get("ACTOR_EDIT_PANEL");
var areaEditPanel = selectTabContainer.Get("AREA_EDIT_PANEL");
actorEditPanel.IsVisible = () => editor.DefaultBrush.Selection.Actor != null;
areaEditPanel.IsVisible = () => editor.DefaultBrush.Selection.Area != null;

2
OpenRA.Mods.Common/Widgets/Logic/Editor/MapToolsLogic.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
toolsDropdown = widget.Get<DropDownButtonWidget>("TOOLS_DROPDOWN");
var markerToolPanel = widget.Get<ScrollPanelWidget>("MARKER_TOOL_PANEL");
var markerToolPanel = widget.Get("MARKER_TOOL_PANEL");
toolPanels.Add(MapTool.MarkerTiles, markerToolPanel);
toolsDropdown.OnMouseDown = _ => ShowToolsDropDown(toolsDropdown);