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

Inherit lobby bin size from the root.

Browse Source
This commit is contained in:
Paul Chote
2015-10-04 17:26:38 +01:00
parent b73f775ef2
commit c6740b1bcb
12 changed files with 51 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -129,7 +129,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
UpdateCurrentMap(); UpdateCurrentMap();
var playerBin = Ui.LoadWidget("LOBBY_PLAYER_BIN", lobby.Get("PLAYER_BIN_ROOT"), new WidgetArgs()); var playerBin = Ui.LoadWidget("LOBBY_PLAYER_BIN", lobby.Get("TOP_PANELS_ROOT"), new WidgetArgs());
playerBin.IsVisible = () => panel == PanelType.Players; playerBin.IsVisible = () => panel == PanelType.Players;
players = playerBin.Get<ScrollPanelWidget>("LOBBY_PLAYERS"); players = playerBin.Get<ScrollPanelWidget>("LOBBY_PLAYERS");
@@ -273,7 +273,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}; };
} }
var optionsBin = Ui.LoadWidget("LOBBY_OPTIONS_BIN", lobby, new WidgetArgs()); var optionsBin = Ui.LoadWidget("LOBBY_OPTIONS_BIN", lobby.Get("TOP_PANELS_ROOT"), new WidgetArgs());
optionsBin.IsVisible = () => panel == PanelType.Options; optionsBin.IsVisible = () => panel == PanelType.Options;
var optionsButton = lobby.Get<ButtonWidget>("OPTIONS_BUTTON"); var optionsButton = lobby.Get<ButtonWidget>("OPTIONS_BUTTON");
@@ -303,7 +303,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}; };
} }
var forceStartBin = Ui.LoadWidget("FORCE_START_DIALOG", lobby, new WidgetArgs()); var forceStartBin = Ui.LoadWidget("FORCE_START_DIALOG", lobby.Get("TOP_PANELS_ROOT"), new WidgetArgs());
forceStartBin.IsVisible = () => panel == PanelType.ForceStart; forceStartBin.IsVisible = () => panel == PanelType.ForceStart;
forceStartBin.Get("KICK_WARNING").IsVisible = () => orderManager.LobbyInfo.Clients.Any(c => c.IsInvalid); forceStartBin.Get("KICK_WARNING").IsVisible = () => orderManager.LobbyInfo.Clients.Any(c => c.IsInvalid);
forceStartBin.Get<ButtonWidget>("OK_BUTTON").OnClick = startGame; forceStartBin.Get<ButtonWidget>("OK_BUTTON").OnClick = startGame;

4
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
View File

@@ -330,7 +330,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
before(); before();
Game.LoadWidget(null, "KICK_CLIENT_DIALOG", lobby, new WidgetArgs Game.LoadWidget(null, "KICK_CLIENT_DIALOG", lobby.Get("TOP_PANELS_ROOT"), new WidgetArgs
{ {
{ "clientName", c.Name }, { "clientName", c.Name },
{ "okPressed", okPressed }, { "okPressed", okPressed },
@@ -364,7 +364,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var spectatorCount = orderManager.LobbyInfo.Clients.Count(c => c.IsObserver); var spectatorCount = orderManager.LobbyInfo.Clients.Count(c => c.IsObserver);
if (spectatorCount > 0) if (spectatorCount > 0)
{ {
Game.LoadWidget(null, "KICK_SPECTATORS_DIALOG", lobby, new WidgetArgs Game.LoadWidget(null, "KICK_SPECTATORS_DIALOG", lobby.Get("TOP_PANELS_ROOT"), new WidgetArgs
{ {
{ "clientCount", "{0}".F(spectatorCount) }, { "clientCount", "{0}".F(spectatorCount) },
{ "okPressed", okPressed }, { "okPressed", okPressed },

26
mods/cnc/chrome/lobby-kickdialogs.yaml
View File

@@ -1,20 +1,16 @@
Background@KICK_CLIENT_DIALOG: Background@KICK_CLIENT_DIALOG:
X: 15 Width: PARENT_RIGHT
Y: 30 Height: PARENT_BOTTOM
Width: 501
Height: 219
Logic: KickClientLogic Logic: KickClientLogic
Background: scrollpanel-bg Background: scrollpanel-bg
Children: Children:
Label@TITLE: Label@TITLE:
X: 0
Y: 40 Y: 40
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
Font: Bold Font: Bold
Align: Center Align: Center
Label@TEXTA: Label@TEXTA:
X: 0
Y: 67 Y: 67
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
@@ -22,7 +18,6 @@ Background@KICK_CLIENT_DIALOG:
Align: Center Align: Center
Text: You may also apply a temporary ban, preventing Text: You may also apply a temporary ban, preventing
Label@TEXTB: Label@TEXTB:
X: 0
Y: 85 Y: 85
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
@@ -51,15 +46,12 @@ Background@KICK_CLIENT_DIALOG:
Text: Cancel Text: Cancel
Font: Bold Font: Bold
Background@KICK_SPECTATORS_DIALOG: Background@KICK_SPECTATORS_DIALOG:
X: 15 Width: PARENT_RIGHT
Y: 30 Height: PARENT_BOTTOM
Width: 501
Height: 219
Logic: KickSpectatorsLogic Logic: KickSpectatorsLogic
Background: scrollpanel-bg Background: scrollpanel-bg
Children: Children:
Label@TITLE: Label@TITLE:
X: 0
Y: 40 Y: 40
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
@@ -67,7 +59,6 @@ Background@KICK_SPECTATORS_DIALOG:
Align: Center Align: Center
Text: Kick Spectators Text: Kick Spectators
Label@TEXT: Label@TEXT:
X: 0
Y: 85 Y: 85
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
@@ -88,14 +79,11 @@ Background@KICK_SPECTATORS_DIALOG:
Text: Cancel Text: Cancel
Font: Bold Font: Bold
Background@FORCE_START_DIALOG: Background@FORCE_START_DIALOG:
X: 15 Width: PARENT_RIGHT
Y: 30 Height: PARENT_BOTTOM
Width: 556
Height: 219
Background: scrollpanel-bg Background: scrollpanel-bg
Children: Children:
Label@TITLE: Label@TITLE:
X: 0
Y: 40 Y: 40
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
@@ -103,7 +91,6 @@ Background@FORCE_START_DIALOG:
Align: Center Align: Center
Text: Start Game? Text: Start Game?
Label@TEXTA: Label@TEXTA:
X: 0
Y: 67 Y: 67
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
@@ -111,7 +98,6 @@ Background@FORCE_START_DIALOG:
Align: Center Align: Center
Text: One or more players are not yet ready. Text: One or more players are not yet ready.
Label@TEXTB: Label@TEXTB:
X: 0
Y: 85 Y: 85
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25

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

@@ -1,12 +1,9 @@
Background@LOBBY_OPTIONS_BIN: Background@LOBBY_OPTIONS_BIN:
X: 15 Width: PARENT_RIGHT
Y: 30 Height: PARENT_BOTTOM
Width: 556
Height: 219
Background: scrollpanel-bg Background: scrollpanel-bg
Children: Children:
Label@TITLE: Label@TITLE:
X: 0
Y: 0 - 25 Y: 0 - 25
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25

12
mods/cnc/chrome/lobby-players.yaml
View File

@@ -3,8 +3,10 @@ Container@LOBBY_PLAYER_BIN:
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Children: Children:
Container@LABEL_CONTAINER: Container@LABEL_CONTAINER:
X: 20 X: 5
Y: 5 Y: 0-25
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children: Children:
Label@NAME: Label@NAME:
Width: 200 Width: 200
@@ -48,10 +50,8 @@ Container@LOBBY_PLAYER_BIN:
Align: Left Align: Left
Font: Bold Font: Bold
ScrollPanel@LOBBY_PLAYERS: ScrollPanel@LOBBY_PLAYERS:
X: 15 Width: PARENT_RIGHT
Y: 30 Height: PARENT_BOTTOM
Width: 556
Height: 219
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 5 ItemSpacing: 5
Children: Children:

6
mods/cnc/chrome/lobby.yaml
View File

@@ -20,7 +20,11 @@ Container@SERVER_LOBBY:
Container@MAP_PREVIEW_ROOT: Container@MAP_PREVIEW_ROOT:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Container@PLAYER_BIN_ROOT: Container@TOP_PANELS_ROOT:
X: 15
Y: 30
Width: 556
Height: 219
DropDownButton@SLOTS_DROPDOWNBUTTON: DropDownButton@SLOTS_DROPDOWNBUTTON:
X: 15 X: 15
Y: 254 Y: 254

6
mods/d2k/chrome/lobby-options.yaml
View File

@@ -1,8 +1,6 @@
Background@LOBBY_OPTIONS_BIN: Background@LOBBY_OPTIONS_BIN:
X: 20 Width: PARENT_RIGHT
Y: 67 Height: PARENT_BOTTOM
Width: 593
Height: 235
Background: dialog3 Background: dialog3
Children: Children:
Label@TITLE: Label@TITLE:

12
mods/d2k/chrome/lobby-players.yaml
View File

@@ -3,8 +3,10 @@ Container@LOBBY_PLAYER_BIN:
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Children: Children:
Container@LABEL_CONTAINER: Container@LABEL_CONTAINER:
X: 25 X: 5
Y: 40 Y: 0-27
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children: Children:
Label@LABEL_LOBBY_NAME: Label@LABEL_LOBBY_NAME:
X: 0 X: 0
@@ -49,12 +51,10 @@ Container@LOBBY_PLAYER_BIN:
Align: Left Align: Left
Font: Bold Font: Bold
ScrollPanel@LOBBY_PLAYERS: ScrollPanel@LOBBY_PLAYERS:
X: 20 Width: PARENT_RIGHT
Y: 67 Height: PARENT_BOTTOM
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 5 ItemSpacing: 5
Width: 593
Height: 235
Children: Children:
Container@TEMPLATE_EDITABLE_PLAYER: Container@TEMPLATE_EDITABLE_PLAYER:
X: 5 X: 5

28
mods/ra/chrome/lobby-kickdialogs.yaml
View File

@@ -1,20 +1,16 @@
Background@KICK_CLIENT_DIALOG: Background@KICK_CLIENT_DIALOG:
X: 20 Width: PARENT_RIGHT
Y: 67 Height: PARENT_BOTTOM
Width: 535
Height: 235
Logic: KickClientLogic Logic: KickClientLogic
Background: dialog3 Background: dialog3
Children: Children:
Label@TITLE: Label@TITLE:
X: 0
Y: 40 Y: 40
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
Font: Bold Font: Bold
Align: Center Align: Center
Label@TEXTA: Label@TEXTA:
X: 0
Y: 67 Y: 67
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
@@ -22,7 +18,6 @@ Background@KICK_CLIENT_DIALOG:
Align: Center Align: Center
Text: You may also apply a temporary ban, preventing Text: You may also apply a temporary ban, preventing
Label@TEXTB: Label@TEXTB:
X: 0
Y: 85 Y: 85
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
@@ -51,15 +46,12 @@ Background@KICK_CLIENT_DIALOG:
Font: Bold Font: Bold
Background@KICK_SPECTATORS_DIALOG: Background@KICK_SPECTATORS_DIALOG:
X: 20 Width: PARENT_RIGHT
Y: 67 Height: PARENT_BOTTOM
Width: 535
Height: 235
Logic: KickSpectatorsLogic Logic: KickSpectatorsLogic
Background: dialog3 Background: dialog3
Children: Children:
Label@TITLE: Label@TITLE:
X: 0
Y: 40 Y: 40
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
@@ -67,7 +59,6 @@ Background@KICK_SPECTATORS_DIALOG:
Align: Center Align: Center
Text: Kick Spectators Text: Kick Spectators
Label@TEXT: Label@TEXT:
X: 0
Y: 85 Y: 85
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
@@ -89,14 +80,11 @@ Background@KICK_SPECTATORS_DIALOG:
Font: Bold Font: Bold
Background@FORCE_START_DIALOG: Background@FORCE_START_DIALOG:
X: 20 Width: PARENT_RIGHT
Y: 67 Height: PARENT_BOTTOM
Width: 593
Height: 235
Background: dialog3 Background: dialog3
Children: Children:
Label@TITLE: Label@TITLE:
X: 0
Y: 40 Y: 40
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
@@ -104,7 +92,6 @@ Background@FORCE_START_DIALOG:
Align: Center Align: Center
Text: Start Game? Text: Start Game?
Label@TEXTA: Label@TEXTA:
X: 0
Y: 67 Y: 67
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
@@ -112,7 +99,6 @@ Background@FORCE_START_DIALOG:
Align: Center Align: Center
Text: One or more players are not yet ready. Text: One or more players are not yet ready.
Label@TEXTB: Label@TEXTB:
X: 0
Y: 85 Y: 85
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
@@ -123,7 +109,6 @@ Background@FORCE_START_DIALOG:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Children: Children:
Label@KICK_WARNING_A: Label@KICK_WARNING_A:
X: 0
Y: 106 Y: 106
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
@@ -131,7 +116,6 @@ Background@FORCE_START_DIALOG:
Align: Center Align: Center
Text: One or more clients are missing the selected Text: One or more clients are missing the selected
Label@KICK_WARNING_B: Label@KICK_WARNING_B:
X: 0
Y: 123 Y: 123
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25

6
mods/ra/chrome/lobby-options.yaml
View File

@@ -1,8 +1,6 @@
Background@LOBBY_OPTIONS_BIN: Background@LOBBY_OPTIONS_BIN:
X: 20 Width: PARENT_RIGHT
Y: 67 Height: PARENT_BOTTOM
Width: 593
Height: 235
Background: dialog3 Background: dialog3
Children: Children:
Label@TITLE: Label@TITLE:

12
mods/ra/chrome/lobby-players.yaml
View File

@@ -3,8 +3,10 @@ Container@LOBBY_PLAYER_BIN:
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Children: Children:
Container@LABEL_CONTAINER: Container@LABEL_CONTAINER:
X: 25 X: 5
Y: 40 Y: 0-27
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children: Children:
Label@LABEL_LOBBY_NAME: Label@LABEL_LOBBY_NAME:
X: 0 X: 0
@@ -49,12 +51,10 @@ Container@LOBBY_PLAYER_BIN:
Align: Left Align: Left
Font: Bold Font: Bold
ScrollPanel@LOBBY_PLAYERS: ScrollPanel@LOBBY_PLAYERS:
X: 20 Width: PARENT_RIGHT
Y: 67 Height: PARENT_BOTTOM
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 5 ItemSpacing: 5
Width: 593
Height: 235
Children: Children:
Container@TEMPLATE_EDITABLE_PLAYER: Container@TEMPLATE_EDITABLE_PLAYER:
X: 5 X: 5

6
mods/ra/chrome/lobby.yaml
View File

@@ -16,7 +16,11 @@ Background@SERVER_LOBBY:
Container@MAP_PREVIEW_ROOT: Container@MAP_PREVIEW_ROOT:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Container@PLAYER_BIN_ROOT: Container@TOP_PANELS_ROOT:
X: 20
Y: 67
Width: 593
Height: 235
DropDownButton@SLOTS_DROPDOWNBUTTON: DropDownButton@SLOTS_DROPDOWNBUTTON:
X: 20 X: 20
Y: PARENT_BOTTOM - 291 Y: PARENT_BOTTOM - 291