Skip to content

Commit

Permalink
Remove PARENT_TOP and PARENT_LEFT from integer expressions for widgets
Browse files Browse the repository at this point in the history
PARENT_TOP and PARENT_LEFT should be 0 so they are not very useful substitutions. They are replaced with 0 or removed if that was the whole value for a field.
  • Loading branch information
dragunoff authored and PunkPun committed Oct 3, 2024
1 parent c0839d4 commit a69ea79
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 6 deletions.
2 changes: 0 additions & 2 deletions OpenRA.Game/Widgets/Widget.cs
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,6 @@ public virtual void Initialize(WidgetArgs args)
substitutions.Add("WINDOW_RIGHT", Game.Renderer.Resolution.Width);
substitutions.Add("WINDOW_BOTTOM", Game.Renderer.Resolution.Height);
substitutions.Add("PARENT_RIGHT", parentBounds.Width);
substitutions.Add("PARENT_LEFT", parentBounds.Left);
substitutions.Add("PARENT_TOP", parentBounds.Top);
substitutions.Add("PARENT_BOTTOM", parentBounds.Height);

var readOnlySubstitutions = new ReadOnlyDictionary<string, int>(substitutions);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#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 RemoveParentTopParentLeftSubstitutions : UpdateRule
{
public override string Name => "Remove PARENT_TOP and PARENT_LEFT from integer expressions for widgets.";

public override string Description =>
"PARENT_TOP is replaced with 0 and PARENT_LEFT is replaced with 0 in integer expressions for width, hegiht 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)
{
if (field.Value.Value == "PARENT_TOP" || field.Value.Value == "PARENT_LEFT")
{
chromeNode.RemoveNode(field);
}
else if (field.Value.Value.Contains("PARENT_TOP"))
{
field.ReplaceValue(field.Value.Value.Replace("PARENT_TOP", "0"));
}
else if (field.Value.Value.Contains("PARENT_LEFT"))
{
field.ReplaceValue(field.Value.Value.Replace("PARENT_LEFT", "0"));
}
}

yield break;
}
}
}
1 change: 1 addition & 0 deletions OpenRA.Mods.Common/UpdateRules/UpdatePath.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public sealed class UpdatePath
new AddSupportPowerBlockedCursor(),
new MovePreviewFacing(),
new RenameOnDeath(),
new RemoveParentTopParentLeftSubstitutions(),

// Execute these rules last to avoid premature yaml merge crashes.
new ReplaceCloakPalette(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -520,8 +520,6 @@ static void RecalculateWidgetLayout(Widget w, bool insideScrollPanel = false)
{ "WINDOW_RIGHT", Game.Renderer.Resolution.Width },
{ "WINDOW_BOTTOM", Game.Renderer.Resolution.Height },
{ "PARENT_RIGHT", parentBounds.Width },
{ "PARENT_LEFT", parentBounds.Left },
{ "PARENT_TOP", parentBounds.Top },
{ "PARENT_BOTTOM", parentBounds.Height }
};

Expand Down
3 changes: 1 addition & 2 deletions mods/common/chrome/ingame-debug-hpf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ Container@HPF_OVERLAY:
Height: 60
Children:
DropDownButton@HPF_OVERLAY_LOCOMOTOR:
Y: PARENT_TOP
Width: PARENT_RIGHT
Height: 25
Text: dropdownbutton-hpf-overlay-locomotor
Font: Regular
DropDownButton@HPF_OVERLAY_CHECK:
Y: PARENT_TOP + 35
Y: 35
Width: PARENT_RIGHT
Height: 25
Text: dropdownbutton-hpf-overlay-check
Expand Down

0 comments on commit a69ea79

Please sign in to comment.