UI Layout v2. (#489)

* UI Layout v2.

* Lobby fixed.
This commit is contained in:
Pieter-Jan Briers
2019-12-05 16:00:03 +01:00
committed by GitHub
parent 4cf8e18d1f
commit 26da24c3c5
37 changed files with 220 additions and 229 deletions

View File

@@ -47,22 +47,14 @@ namespace Content.Client.Research
{
SizeFlagsVertical = SizeFlags.FillExpand,
SizeFlagsHorizontal = SizeFlags.FillExpand,
MarginTop = 5f,
MarginLeft = 5f,
MarginRight = -5f,
MarginBottom = -5f,
};
margin.SetAnchorAndMarginPreset(LayoutPreset.Wide);
var vBox = new VBoxContainer()
{
SizeFlagsVertical = SizeFlags.FillExpand,
SeparationOverride = 5,
};
vBox.SetAnchorAndMarginPreset(LayoutPreset.Wide);
var hBoxButtons = new HBoxContainer()
{
SizeFlagsHorizontal = SizeFlags.FillExpand,
@@ -100,8 +92,6 @@ namespace Content.Client.Research
SizeFlagsStretchRatio = 3,
};
spacer.SetAnchorAndMarginPreset(LayoutPreset.Wide);
var hBoxFilter = new HBoxContainer()
{
SizeFlagsHorizontal = SizeFlags.FillExpand,

View File

@@ -27,24 +27,24 @@ namespace Content.Client.Research
var margin = new MarginContainer()
{
MarginTop = 5f,
/*MarginTop = 5f,
MarginLeft = 5f,
MarginRight = -5f,
MarginBottom = -5f,
MarginBottom = -5f,*/
};
margin.SetAnchorAndMarginPreset(LayoutPreset.Wide);
// margin.SetAnchorAndMarginPreset(LayoutPreset.Wide);
var vBox = new VBoxContainer();
vBox.SetAnchorAndMarginPreset(LayoutPreset.Wide);
// vBox.SetAnchorAndMarginPreset(LayoutPreset.Wide);
var descMargin = new MarginContainer()
{
MarginTop = 5f,
/*MarginTop = 5f,
MarginLeft = 5f,
MarginRight = -5f,
MarginBottom = -5f,
MarginBottom = -5f,*/
SizeFlagsHorizontal = SizeFlags.FillExpand,
SizeFlagsStretchRatio = 2,
};