tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove usages of SizeFlags (#4662)

Browse Source 
* Remove usages of SizeFlags

* Remove defaults
This commit is contained in:
Visne
2021-10-03 13:37:52 +02:00
committed by GitHub
parent 6fdb364497
commit 553ca72c74
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
View File

@@ -1,13 +1,13 @@
<BoxContainer xmlns="https://spacestation14.io" <BoxContainer xmlns="https://spacestation14.io"
Orientation="Vertical"> Orientation="Vertical">
<Control MinSize="0 5" /> <Control MinSize="0 5" />
<BoxContainer Orientation="Horizontal"> <LineEdit Name="FilterLineEdit"
<!-- <Label Text="{Loc Search}" CustomMinimumSize="100 0" /> --> MinSize="100 0"
<!-- <Control CustomMinimumSize="50 0" /> --> HorizontalExpand="True"
<LineEdit Name="FilterLineEdit" MinSize="100 0" SizeFlagsHorizontal="FillExpand" PlaceHolder="{Loc Filter}"/> PlaceHolder="{Loc Filter}"/>
</BoxContainer> <ItemList Name="PlayerItemList"
<!-- <Control CustomMinimumSize="0 5" /> --> SelectMode="Single"
<ItemList VerticalExpand="True"
Name="PlayerItemList" SelectMode="Single" SizeFlagsVertical="FillExpand" SizeFlagsHorizontal="FillExpand" HorizontalExpand="True"
MinSize="100 100" /> MinSize="100 100" />
</BoxContainer> </BoxContainer>

2
Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
View File

@@ -348,7 +348,7 @@ namespace Content.Client.CharacterAppearance
_facialHairStylePicker.OnHairStylePicked += newStyle => owner.HairSelected(newStyle, true); _facialHairStylePicker.OnHairStylePicked += newStyle => owner.HairSelected(newStyle, true);
_facialHairStylePicker.OnHairColorPicked += newColor => owner.HairColorSelected(newColor, true); _facialHairStylePicker.OnHairColorPicked += newColor => owner.HairColorSelected(newColor, true);
_eyeColorPicker = new EyeColorPicker {SizeFlagsHorizontal = SizeFlags.FillExpand}; _eyeColorPicker = new EyeColorPicker { HorizontalExpand = true };
_eyeColorPicker.OnEyeColorPicked += newColor => owner.EyeColorSelected(newColor); _eyeColorPicker.OnEyeColorPicked += newColor => owner.EyeColorSelected(newColor);
Contents.AddChild(new BoxContainer Contents.AddChild(new BoxContainer

2
Content.Client/Suspicion/SuspicionGui.xaml
View File

@@ -1,7 +1,7 @@
<Control xmlns="https://spacestation14.io"> <Control xmlns="https://spacestation14.io">
<BoxContainer Orientation="Vertical" SeparationOverride="0"> <BoxContainer Orientation="Vertical" SeparationOverride="0">
<Button Name="RoleButton"> <Button Name="RoleButton">
<Label Name="TimerLabel" SizeFlagsHorizontal="ShrinkEnd" SizeFlagsVertical="ShrinkEnd" /> <Label Name="TimerLabel" HorizontalAlignment="Right" VerticalAlignment="Bottom" />
</Button> </Button>
</BoxContainer> </BoxContainer>
</Control> </Control>

5
Content.Client/Verbs/VerbSystem.cs
View File

@@ -434,10 +434,7 @@ namespace Content.Client.Verbs
Stretch = TextureRect.StretchMode.KeepCentered Stretch = TextureRect.StretchMode.KeepCentered
}), }),
(_label = new Label (_label = new Label { HorizontalExpand = true }),
{
SizeFlagsHorizontal = SizeFlags.FillExpand
}),
// Padding // Padding
new Control {MinSize = (8, 0)}, new Control {MinSize = (8, 0)},