space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-06-09 10:06:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Overrides In WrapContainer (#6561)

Browse Source 
Make {,Cross}SeparationOverride override StyleProperty

The doc comments say that Overide overrides the StyleProperty, but the
actual code makes it so that Seperationoverride is a fallback value.
This commit is contained in:
Thomas
2026-05-13 10:38:22 -05:00
committed by GitHub
parent aac0e4d1c0
commit 2e5f20cfb2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Robust.Client/UserInterface/Controls/WrapContainer.cs
+6 -6
View File
@@ -127,12 +127,12 @@ public sealed class WrapContainer : Container
{
get
{
if (TryGetStyleProperty(StylePropertySeparation, out int separation))
if (SeparationOverride is not null)
{
return separation;
return SeparationOverride.Value;
}
return SeparationOverride ?? 0;
return StylePropertyDefault(StylePropertySeparation, 0);
}
}
@@ -140,12 +140,12 @@ public sealed class WrapContainer : Container
{
get
{
if (TryGetStyleProperty(StylePropertyCrossSeparation, out int separation))
if (CrossSeparationOverride is not null)
{
return separation;
return CrossSeparationOverride.Value;
}
return CrossSeparationOverride ?? 0;
return StylePropertyDefault(StylePropertyCrossSeparation, 0);
}
}