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

Evaluate read only dictionaries.

Browse Source
This commit is contained in:
Matthias Mailänder
2023-08-05 13:02:17 +02:00
committed by Gustas
parent ce002ce8c1
commit b6a5d19871
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
@@ -510,8 +511,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ "PARENT_BOTTOM", parentBounds.Height } { "PARENT_BOTTOM", parentBounds.Height }
}; };
var width = w.Width.Evaluate(substitutions); var readOnlySubstitutions = new ReadOnlyDictionary<string, int>(substitutions);
var height = w.Height.Evaluate(substitutions); var width = w.Width != null ? w.Width.Evaluate(readOnlySubstitutions) : 0;
var height = w.Height != null ? w.Height.Evaluate(readOnlySubstitutions) : 0;
substitutions.Add("WIDTH", width); substitutions.Add("WIDTH", width);
substitutions.Add("HEIGHT", height); substitutions.Add("HEIGHT", height);
@@ -520,8 +522,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
w.Bounds = new Rectangle(w.Bounds.X, w.Bounds.Y, width, w.Bounds.Height); w.Bounds = new Rectangle(w.Bounds.X, w.Bounds.Y, width, w.Bounds.Height);
else else
w.Bounds = new Rectangle( w.Bounds = new Rectangle(
w.X.Evaluate(substitutions), w.X != null ? w.X.Evaluate(readOnlySubstitutions) : 0,
w.Y.Evaluate(substitutions), w.Y != null ? w.Y.Evaluate(readOnlySubstitutions) : 0,
width, width,
height); height);