Fix UI layout bugs with the PA.

This commit is contained in:
Pieter-Jan Briers
2021-02-06 17:39:53 +01:00
parent 4272716289
commit 5cbb3f1222

View File

@@ -188,11 +188,11 @@ namespace Content.Client.ParticleAccelerator
new MarginContainer new MarginContainer
{ {
MarginLeftOverride = 4, MarginLeftOverride = 4,
SizeFlagsHorizontal = SizeFlags.FillExpand,
Children = Children =
{ {
new VBoxContainer new VBoxContainer
{ {
SizeFlagsHorizontal = SizeFlags.FillExpand,
Children = Children =
{ {
new HBoxContainer new HBoxContainer
@@ -246,55 +246,61 @@ namespace Content.Client.ParticleAccelerator
} }
} }
}, },
new VBoxContainer new MarginContainer
{ {
SizeFlagsHorizontal = SizeFlags.FillExpand, CustomMinimumSize = (186, 0),
Children = Children =
{ {
(_statusLabel = new Label new VBoxContainer
{ {
SizeFlagsHorizontal = SizeFlags.ShrinkCenter
}),
new Control
{
CustomMinimumSize = (0, 20)
},
new PanelContainer
{
SizeFlagsHorizontal = SizeFlags.ShrinkCenter,
PanelOverride = back2,
Children = Children =
{ {
new GridContainer (_statusLabel = new Label
{ {
Columns = 3, SizeFlagsHorizontal = SizeFlags.ShrinkCenter
VSeparationOverride = 0, }),
HSeparationOverride = 0, new Control
{
CustomMinimumSize = (0, 20)
},
new PanelContainer
{
SizeFlagsHorizontal = SizeFlags.ShrinkCenter,
PanelOverride = back2,
Children = Children =
{ {
new Control {CustomMinimumSize = imgSize}, new GridContainer
(_endCapTexture = Segment("end_cap")), {
new Control {CustomMinimumSize = imgSize}, Columns = 3,
(_controlBoxTexture = Segment("control_box")), VSeparationOverride = 0,
(_fuelChamberTexture = Segment("fuel_chamber")), HSeparationOverride = 0,
new Control {CustomMinimumSize = imgSize}, Children =
new Control {CustomMinimumSize = imgSize}, {
(_powerBoxTexture = Segment("power_box")), new Control {CustomMinimumSize = imgSize},
new Control {CustomMinimumSize = imgSize}, (_endCapTexture = Segment("end_cap")),
(_emitterLeftTexture = Segment("emitter_left")), new Control {CustomMinimumSize = imgSize},
(_emitterCenterTexture = Segment("emitter_center")), (_controlBoxTexture = Segment("control_box")),
(_emitterRightTexture = Segment("emitter_right")), (_fuelChamberTexture = Segment("fuel_chamber")),
new Control {CustomMinimumSize = imgSize},
new Control {CustomMinimumSize = imgSize},
(_powerBoxTexture = Segment("power_box")),
new Control {CustomMinimumSize = imgSize},
(_emitterLeftTexture = Segment("emitter_left")),
(_emitterCenterTexture = Segment("emitter_center")),
(_emitterRightTexture = Segment("emitter_right")),
}
}
} }
} },
(_scanButton = new Button
{
Text = Loc.GetString("Scan Parts"),
SizeFlagsHorizontal = SizeFlags.ShrinkCenter
})
} }
}, }
(_scanButton = new Button
{
Text = Loc.GetString("Scan Parts"),
SizeFlagsHorizontal = SizeFlags.ShrinkCenter
})
} }
} },
} }
}, },
new StripeBack new StripeBack
@@ -507,7 +513,7 @@ namespace Content.Client.ParticleAccelerator
public void SetPowerState(ParticleAcceleratorUIState state, bool exists) public void SetPowerState(ParticleAcceleratorUIState state, bool exists)
{ {
_base.ShaderOverride = exists ? null : _menu._greyScaleShader; _base.ShaderOverride = exists ? null : _menu._greyScaleShader;
_base.ModulateSelfOverride = exists ? (Color?)null : new Color(127, 127, 127); _base.ModulateSelfOverride = exists ? (Color?) null : new Color(127, 127, 127);
if (!state.Enabled || !exists) if (!state.Enabled || !exists)
{ {