epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update lobby options tab layout to match settings layout

Browse Source
This commit is contained in:
Ivaylo Draganov
2021-10-07 10:48:12 +03:00
committed by reaperrr
parent 9f96d4159a
commit 8a2b63c944
3 changed files with 71 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyOptionsLogic.cs
View File

@@ -161,7 +161,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var label = row.GetOrNull<LabelWidget>(dropdown.Id + "_DESC"); var label = row.GetOrNull<LabelWidget>(dropdown.Id + "_DESC");
if (label != null) if (label != null)
{ {
label.GetText = () => option.Name; label.GetText = () => option.Name + ":";
label.IsVisible = () => true; label.IsVisible = () => true;
} }
} }

57
mods/cnc/chrome/lobby-options.yaml
View File

@@ -15,58 +15,73 @@ Container@LOBBY_OPTIONS_BIN:
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Children: Children:
Container@LOBBY_OPTIONS: Container@LOBBY_OPTIONS:
X: 18 Y: 10
Y: 9 Width: PARENT_RIGHT - 24
Width: PARENT_RIGHT - 24 - 18
Children: Children:
Container@CHECKBOX_ROW_TEMPLATE: Container@CHECKBOX_ROW_TEMPLATE:
Height: 34 Width: PARENT_RIGHT
Height: 30
Children: Children:
Checkbox@A: Checkbox@A:
Width: 220 X: 10
Width: PARENT_RIGHT / 3 - 20
Height: 20 Height: 20
Font: Regular Font: Regular
Visible: False Visible: False
TooltipContainer: TOOLTIP_CONTAINER TooltipContainer: TOOLTIP_CONTAINER
Checkbox@B: Checkbox@B:
X: 225 X: PARENT_RIGHT / 3 + 10
Width: 220 Width: PARENT_RIGHT / 3 - 20
Height: 20 Height: 20
Font: Regular Font: Regular
Visible: False Visible: False
TooltipContainer: TOOLTIP_CONTAINER TooltipContainer: TOOLTIP_CONTAINER
Checkbox@C: Checkbox@C:
X: 450 X: (PARENT_RIGHT / 3) * 2 + 10
Width: 190 Width: PARENT_RIGHT / 3 - 20
Height: 20 Height: 20
Font: Regular Font: Regular
Visible: False Visible: False
TooltipContainer: TOOLTIP_CONTAINER TooltipContainer: TOOLTIP_CONTAINER
Container@DROPDOWN_ROW_TEMPLATE: Container@DROPDOWN_ROW_TEMPLATE:
Height: 34 Height: 60
Width: PARENT_RIGHT Width: PARENT_RIGHT
Children: Children:
Label@A_DESC: Label@A_DESC:
Width: 140 X: 10
Height: 25 Width: PARENT_RIGHT / 3 - 20
Align: Right Height: 20
Visible: False Visible: False
DropDownButton@A: DropDownButton@A:
X: 145 X: 10
Width: 180 Width: PARENT_RIGHT / 3 - 20
Y: 25
Height: 25 Height: 25
Font: Regular Font: Regular
Visible: False Visible: False
TooltipContainer: TOOLTIP_CONTAINER TooltipContainer: TOOLTIP_CONTAINER
Label@B_DESC: Label@B_DESC:
X: PARENT_RIGHT - WIDTH - 203 X: PARENT_RIGHT / 3 + 10
Width: 140 Width: PARENT_RIGHT / 3 - 20
Height: 25 Height: 20
Align: Right
Visible: False Visible: False
DropDownButton@B: DropDownButton@B:
X: PARENT_RIGHT - WIDTH - 18 X: PARENT_RIGHT / 3 + 10
Width: 180 Width: PARENT_RIGHT / 3 - 20
Y: 25
Height: 25
Font: Regular
Visible: False
TooltipContainer: TOOLTIP_CONTAINER
Label@C_DESC:
X: (PARENT_RIGHT / 3) * 2 + 10
Width: PARENT_RIGHT / 3 - 20
Height: 20
Visible: False
DropDownButton@C:
X: (PARENT_RIGHT / 3) * 2 + 10
Width: PARENT_RIGHT / 3 - 20
Y: 25
Height: 25 Height: 25
Font: Regular Font: Regular
Visible: False Visible: False

55
mods/common/chrome/lobby-options.yaml
View File

@@ -15,55 +15,68 @@ Container@LOBBY_OPTIONS_BIN:
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Children: Children:
Container@LOBBY_OPTIONS: Container@LOBBY_OPTIONS:
X: 10 Y: 10
Y: 9 Width: PARENT_RIGHT - 24
Width: PARENT_RIGHT - 10 - 24
Children: Children:
Container@CHECKBOX_ROW_TEMPLATE: Container@CHECKBOX_ROW_TEMPLATE:
Width: PARENT_RIGHT
Height: 30 Height: 30
Children: Children:
Checkbox@A: Checkbox@A:
Width: 220 X: 10
Width: PARENT_RIGHT / 3 - 20
Height: 20 Height: 20
Visible: False Visible: False
TooltipContainer: TOOLTIP_CONTAINER TooltipContainer: TOOLTIP_CONTAINER
Checkbox@B: Checkbox@B:
X: 225 X: PARENT_RIGHT / 3 + 10
Width: 220 Width: PARENT_RIGHT / 3 - 20
Height: 20 Height: 20
Visible: False Visible: False
TooltipContainer: TOOLTIP_CONTAINER TooltipContainer: TOOLTIP_CONTAINER
Checkbox@C: Checkbox@C:
X: 450 X: (PARENT_RIGHT / 3) * 2 + 10
Width: 190 Width: PARENT_RIGHT / 3 - 20
Height: 20 Height: 20
Visible: False Visible: False
TooltipContainer: TOOLTIP_CONTAINER TooltipContainer: TOOLTIP_CONTAINER
Container@DROPDOWN_ROW_TEMPLATE: Container@DROPDOWN_ROW_TEMPLATE:
Height: 30 Height: 60
Width: PARENT_RIGHT Width: PARENT_RIGHT
Children: Children:
Label@A_DESC: Label@A_DESC:
Width: 140 X: 10
Height: 25 Width: PARENT_RIGHT / 3 - 20
Align: Right Height: 20
Visible: False Visible: False
DropDownButton@A: DropDownButton@A:
X: 145 X: 10
Width: 180 Width: PARENT_RIGHT / 3 - 20
Y: 25
Height: 25 Height: 25
Visible: False Visible: False
TooltipContainer: TOOLTIP_CONTAINER TooltipContainer: TOOLTIP_CONTAINER
Label@B_DESC: Label@B_DESC:
X: PARENT_RIGHT - WIDTH - 203 X: PARENT_RIGHT / 3 + 10
Width: 140 Width: PARENT_RIGHT / 3 - 20
Height: 25 Height: 20
Align: Right
Visible: False Visible: False
DropDownButton@B: DropDownButton@B:
X: PARENT_RIGHT - WIDTH - 18 X: PARENT_RIGHT / 3 + 10
Width: 180 Width: PARENT_RIGHT / 3 - 20
Y: 25
Height: 25
Visible: False
TooltipContainer: TOOLTIP_CONTAINER
Label@C_DESC:
X: (PARENT_RIGHT / 3) * 2 + 10
Width: PARENT_RIGHT / 3 - 20
Height: 20
Visible: False
DropDownButton@C:
X: (PARENT_RIGHT / 3) * 2 + 10
Width: PARENT_RIGHT / 3 - 20
Y: 25
Height: 25 Height: 25
Font: Regular
Visible: False Visible: False
TooltipContainer: TOOLTIP_CONTAINER TooltipContainer: TOOLTIP_CONTAINER