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

Rename *_RIGHT to *_WIDTH and *_BOTTOM to *_HEIGHT in integer expressions for widgets

Browse Source 
The terms "width" and "height" are clearer and they match what the values actually represent (window or parent width/height). The YAML changes are generated with the update rule.
This commit is contained in:
Ivaylo Draganov
2024-10-04 11:04:46 +03:00
committed by Gustas
parent bb17cfa179
commit 79ae71a517
125 changed files with 3503 additions and 3457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
OpenRA.Mods.Common/UpdateRules/Rules/20231010/RenameWidgetSubstitutions.cs Normal file
View File

@@ -0,0 +1,45 @@
#region Copyright & License Information
/*
* Copyright (c) The OpenRA Developers and Contributors
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using System.Collections.Generic;
using System.Linq;
namespace OpenRA.Mods.Common.UpdateRules.Rules
{
public class RenameWidgetSubstitutions : UpdateRule
{
public override string Name => "Rename *_RIGHT to *_WIDTH and *_BOTTOM to *_HEIGHT in integer expressions for widgets.";
public override string Description =>
"PARENT_RIGHT -> PARENT_WIDTH, PARENT_BOTTOM -> PARENT_HEIGHT, " +
"WINDOW_RIGHT -> WINDOW_WIDTH, WINDOW_BOTTOM -> WINDOW_HEIGHT " +
"in integer expressions for width, height and position.";
public override IEnumerable<string> UpdateChromeNode(ModData modData, MiniYamlNodeBuilder chromeNode)
{
var dimensionFields =
chromeNode.ChildrenMatching("Width")
.Concat(chromeNode.ChildrenMatching("Height"))
.Concat(chromeNode.ChildrenMatching("X"))
.Concat(chromeNode.ChildrenMatching("Y")).ToArray();
foreach (var field in dimensionFields)
{
field.ReplaceValue(field.Value.Value.Replace("PARENT_RIGHT", "PARENT_WIDTH"));
field.ReplaceValue(field.Value.Value.Replace("PARENT_BOTTOM", "PARENT_HEIGHT"));
field.ReplaceValue(field.Value.Value.Replace("WINDOW_RIGHT", "WINDOW_WIDTH"));
field.ReplaceValue(field.Value.Value.Replace("WINDOW_BOTTOM", "WINDOW_HEIGHT"));
}
yield break;
}
}
}

1
OpenRA.Mods.Common/UpdateRules/UpdatePath.cs
View File

@@ -91,6 +91,7 @@ namespace OpenRA.Mods.Common.UpdateRules
new MovePreviewFacing(),
new RenameOnDeath(),
new RemoveParentTopParentLeftSubstitutions(),
new RenameWidgetSubstitutions(),
// Execute these rules last to avoid premature yaml merge crashes.
new ReplaceCloakPalette(),

2
OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs
View File

@@ -243,7 +243,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
// HACK: MULTIPLAYER_FILTER_PANEL doesn't follow our normal procedure for dropdown creation
// but we still need to be able to set the dropdown width based on the parent
// The yaml should use PARENT_RIGHT instead of DROPDOWN_WIDTH
// The yaml should use PARENT_WIDTH instead of DROPDOWN_WIDTH
var filtersPanel = Ui.LoadWidget("MULTIPLAYER_FILTER_PANEL", filtersButton, new WidgetArgs());
filtersButton.Children.Remove(filtersPanel);

8
OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs
View File

@@ -517,10 +517,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var substitutions = new Dictionary<string, int>
{
{ "WINDOW_RIGHT", Game.Renderer.Resolution.Width },
{ "WINDOW_BOTTOM", Game.Renderer.Resolution.Height },
{ "PARENT_RIGHT", parentBounds.Width },
{ "PARENT_BOTTOM", parentBounds.Height }
{ "WINDOW_WIDTH", Game.Renderer.Resolution.Width },
{ "WINDOW_HEIGHT", Game.Renderer.Resolution.Height },
{ "PARENT_WIDTH", parentBounds.Width },
{ "PARENT_HEIGHT", parentBounds.Height }
};
var readOnlySubstitutions = new ReadOnlyDictionary<string, int>(substitutions);