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

WPF layout (#3346)

Browse Source
This commit is contained in:
Pieter-Jan Briers
2021-02-21 12:38:56 +01:00
committed by GitHub
parent 33d6975c25
commit b898443f28
121 changed files with 1420 additions and 2069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Content.Client/UserInterface/Permissions/PermissionsEui.cs
View File

@@ -246,7 +246,8 @@ namespace Content.Client.UserInterface.Permissions
al.AddChild(new Label
{
Text = flagsText,
SizeFlagsHorizontal = Control.SizeFlags.ShrinkCenter | Control.SizeFlags.Expand
HorizontalExpand = true,
HorizontalAlignment = Control.HAlignment.Center,
});
var editButton = new Button {Text = Loc.GetString("Edit")};
@@ -269,7 +270,8 @@ namespace Content.Client.UserInterface.Permissions
_menu.AdminRanksList.AddChild(new Label
{
Text = flagsText,
SizeFlagsHorizontal = Control.SizeFlags.ShrinkCenter | Control.SizeFlags.Expand
HorizontalExpand = true,
HorizontalAlignment = Control.HAlignment.Center,
});
var editButton = new Button {Text = Loc.GetString("Edit")};
editButton.OnPressed += _ => OnEditRankPressed(kv);
@@ -306,16 +308,16 @@ namespace Content.Client.UserInterface.Permissions
AddAdminButton = new Button
{
Text = Loc.GetString("Add Admin"),
SizeFlagsHorizontal = SizeFlags.ShrinkEnd
HorizontalAlignment = HAlignment.Right
};
AddAdminRankButton = new Button
{
Text = Loc.GetString("Add Admin Rank"),
SizeFlagsHorizontal = SizeFlags.ShrinkEnd
HorizontalAlignment = HAlignment.Right
};
AdminsList = new GridContainer {Columns = 5, SizeFlagsVertical = SizeFlags.FillExpand};
AdminsList = new GridContainer {Columns = 5, VerticalExpand = true};
var adminVBox = new VBoxContainer
{
Children = {AdminsList, AddAdminButton},
@@ -352,6 +354,7 @@ namespace Content.Client.UserInterface.Permissions
public EditAdminWindow(PermissionsEui ui, PermissionsEuiState.AdminData? data)
{
SetSize = MinSize = (600, 400);
SourceData = data;
Control nameControl;
@@ -372,7 +375,7 @@ namespace Content.Client.UserInterface.Permissions
TitleEdit = new LineEdit {PlaceHolder = Loc.GetString("Custom title, leave blank to inherit rank title.")};
RankButton = new OptionButton();
SaveButton = new Button {Text = Loc.GetString("Save"), SizeFlagsHorizontal = SizeFlags.ShrinkEnd | SizeFlags.Expand};
SaveButton = new Button {Text = Loc.GetString("Save"), HorizontalAlignment = HAlignment.Right};
RankButton.AddItem(Loc.GetString("No rank"), NoRank);
foreach (var (rId, rank) in ui._ranks)
@@ -470,7 +473,7 @@ namespace Content.Client.UserInterface.Permissions
{
new VBoxContainer
{
SizeFlagsHorizontal = SizeFlags.FillExpand,
HorizontalExpand = true,
Children =
{
nameControl,
@@ -480,7 +483,7 @@ namespace Content.Client.UserInterface.Permissions
},
permGrid
},
SizeFlagsVertical = SizeFlags.FillExpand
VerticalExpand = true
},
bottomButtons
}
@@ -509,8 +512,6 @@ namespace Content.Client.UserInterface.Permissions
}
}
}
protected override Vector2? CustomSize => (600, 400);
}
private sealed class EditAdminRankWindow : SS14Window
@@ -523,6 +524,7 @@ namespace Content.Client.UserInterface.Permissions
public EditAdminRankWindow(PermissionsEui ui, KeyValuePair<int, PermissionsEuiState.AdminRankData>? data)
{
MinSize = SetSize = (600, 400);
SourceId = data?.Key;
NameEdit = new LineEdit
@@ -535,7 +537,11 @@ namespace Content.Client.UserInterface.Permissions
NameEdit.Text = data.Value.Value.Name;
}
SaveButton = new Button {Text = Loc.GetString("Save"), SizeFlagsHorizontal = SizeFlags.ShrinkEnd | SizeFlags.Expand};
SaveButton = new Button {
Text = Loc.GetString("Save"),
HorizontalAlignment = HAlignment.Right,
HorizontalExpand = true
};
var flagsBox = new VBoxContainer();
foreach (var flag in AdminFlagsHelper.AllFlags)
@@ -594,8 +600,6 @@ namespace Content.Client.UserInterface.Permissions
return flags;
}
protected override Vector2? CustomSize => (600, 400);
}
}
}