From 16198c121cd3df7de4147fa0973bf162161e4daa Mon Sep 17 00:00:00 2001 From: Gustas <37534529+PunkPun@users.noreply.github.com> Date: Wed, 10 Aug 2022 15:37:05 +0300 Subject: [PATCH] Increase the size of ingame-info panel And add an Actions section for Kick --- .../cnc/chrome/ingame-info-lobby-options.yaml | 2 +- mods/cnc/chrome/ingame-info.yaml | 2 +- mods/cnc/chrome/ingame-infostats.yaml | 21 ++++++++++----- .../chrome/ingame-info-lobby-options.yaml | 2 +- mods/common/chrome/ingame-info.yaml | 2 +- mods/common/chrome/ingame-infostats.yaml | 27 ++++++++++++------- mods/d2k/chrome/ingame-infostats.yaml | 22 ++++++++++----- 7 files changed, 53 insertions(+), 25 deletions(-) diff --git a/mods/cnc/chrome/ingame-info-lobby-options.yaml b/mods/cnc/chrome/ingame-info-lobby-options.yaml index 98f1dcf9dc..38dfaaafcc 100644 --- a/mods/cnc/chrome/ingame-info-lobby-options.yaml +++ b/mods/cnc/chrome/ingame-info-lobby-options.yaml @@ -6,7 +6,7 @@ Container@LOBBY_OPTIONS_PANEL: Logic: LobbyOptionsLogic X: 15 Y: 15 - Width: 482 + Width: PARENT_RIGHT - 30 Height: 375 Children: Container@LOBBY_OPTIONS: diff --git a/mods/cnc/chrome/ingame-info.yaml b/mods/cnc/chrome/ingame-info.yaml index 81e31c4df3..717f30abb9 100644 --- a/mods/cnc/chrome/ingame-info.yaml +++ b/mods/cnc/chrome/ingame-info.yaml @@ -1,7 +1,7 @@ Container@GAME_INFO_PANEL: X: (WINDOW_RIGHT - WIDTH) / 2 Y: (WINDOW_BOTTOM - HEIGHT) / 2 - Width: 512 + Width: 570 Height: 435 Logic: GameInfoLogic Visible: False diff --git a/mods/cnc/chrome/ingame-infostats.yaml b/mods/cnc/chrome/ingame-infostats.yaml index 76cbe121e7..b8383e50fd 100644 --- a/mods/cnc/chrome/ingame-infostats.yaml +++ b/mods/cnc/chrome/ingame-infostats.yaml @@ -31,7 +31,7 @@ Container@SKIRMISH_STATS: Container@STATS_HEADERS: X: 17 Y: 80 - Width: 393 + Width: PARENT_RIGHT - 34 Children: Label@NAME: X: 10 @@ -54,10 +54,16 @@ Container@SKIRMISH_STATS: Height: 25 Text: Score Font: Bold + Label@ACTIONS: + X: 457 + Width: 20 + Height: 25 + Text: Actions + Font: Bold ScrollPanel@PLAYER_LIST: X: 15 Y: 105 - Width: 482 + Width: PARENT_RIGHT - 30 Height: 285 ItemSpacing: 5 Children: @@ -143,12 +149,15 @@ Container@SKIRMISH_STATS: Height: 25 Shadow: True Button@KICK: - X: 195 - Width: 24 + X: 485 + Width: 25 Height: 25 + Background: checkbox-toggle + TooltipContainer: TOOLTIP_CONTAINER + TooltipText: Kick this player Children: Image: ImageCollection: lobby-bits ImageName: kick - X: 6 - Y: 8 + X: 7 + Y: 7 diff --git a/mods/common/chrome/ingame-info-lobby-options.yaml b/mods/common/chrome/ingame-info-lobby-options.yaml index aa00fc2583..331b141f53 100644 --- a/mods/common/chrome/ingame-info-lobby-options.yaml +++ b/mods/common/chrome/ingame-info-lobby-options.yaml @@ -6,7 +6,7 @@ Container@LOBBY_OPTIONS_PANEL: Logic: LobbyOptionsLogic X: 20 Y: 20 - Width: 482 + Width: PARENT_RIGHT - 40 Height: 365 Children: Container@LOBBY_OPTIONS: diff --git a/mods/common/chrome/ingame-info.yaml b/mods/common/chrome/ingame-info.yaml index 345cbff677..b642463809 100644 --- a/mods/common/chrome/ingame-info.yaml +++ b/mods/common/chrome/ingame-info.yaml @@ -1,7 +1,7 @@ Container@GAME_INFO_PANEL: X: (WINDOW_RIGHT - WIDTH) / 2 Y: (WINDOW_BOTTOM - HEIGHT) / 2 - Width: 522 + Width: 580 Height: 500 Logic: GameInfoLogic Visible: False diff --git a/mods/common/chrome/ingame-infostats.yaml b/mods/common/chrome/ingame-infostats.yaml index e57c3bd57f..981b796489 100644 --- a/mods/common/chrome/ingame-infostats.yaml +++ b/mods/common/chrome/ingame-infostats.yaml @@ -31,7 +31,7 @@ Container@SKIRMISH_STATS: Container@STATS_HEADERS: X: 22 Y: 81 - Width: 393 + Width: PARENT_RIGHT - 44 Children: Label@NAME: X: 10 @@ -51,16 +51,22 @@ Container@SKIRMISH_STATS: Height: 25 Text: Score Font: Bold + Label@ACTIONS: + X: 457 + Width: 20 + Height: 25 + Text: Actions + Font: Bold ScrollPanel@PLAYER_LIST: X: 20 Y: 105 - Width: 482 + Width: PARENT_RIGHT - 40 Height: 280 ItemSpacing: 5 Children: ScrollItem@TEAM_TEMPLATE: BaseName: scrollheader - Width: PARENT_RIGHT - 27 + Width: PARENT_RIGHT - 26 Height: 20 X: 2 Visible: false @@ -78,7 +84,7 @@ Container@SKIRMISH_STATS: Height: 20 Font: Bold Container@PLAYER_TEMPLATE: - Width: PARENT_RIGHT - 27 + Width: PARENT_RIGHT - 26 Height: 25 X: 2 Children: @@ -118,7 +124,7 @@ Container@SKIRMISH_STATS: Height: 25 Shadow: True Container@SPECTATOR_TEMPLATE: - Width: PARENT_RIGHT - 27 + Width: PARENT_RIGHT - 26 Height: 25 X: 2 Children: @@ -141,12 +147,15 @@ Container@SKIRMISH_STATS: Height: 25 Shadow: True Button@KICK: - X: 195 - Width: 24 + X: 485 + Width: 25 Height: 25 + Background: checkbox-toggle + TooltipContainer: TOOLTIP_CONTAINER + TooltipText: Kick this player Children: Image: ImageCollection: lobby-bits ImageName: kick - X: 6 - Y: 8 + X: 7 + Y: 7 diff --git a/mods/d2k/chrome/ingame-infostats.yaml b/mods/d2k/chrome/ingame-infostats.yaml index 4c22157605..9dc7e0c75e 100644 --- a/mods/d2k/chrome/ingame-infostats.yaml +++ b/mods/d2k/chrome/ingame-infostats.yaml @@ -31,7 +31,7 @@ Container@SKIRMISH_STATS: Container@STATS_HEADERS: X: 22 Y: 81 - Width: 393 + Width: PARENT_RIGHT - 44 Children: Label@NAME: X: 10 @@ -54,10 +54,17 @@ Container@SKIRMISH_STATS: Height: 25 Text: Score Font: Bold + Label@ACTIONS: + X: 457 + Y: 1 + Width: 20 + Height: 25 + Text: Actions + Font: Bold ScrollPanel@PLAYER_LIST: X: 20 Y: 105 - Width: 482 + Width: PARENT_RIGHT - 40 Height: 265 ItemSpacing: 5 Children: @@ -142,12 +149,15 @@ Container@SKIRMISH_STATS: Height: 25 Shadow: True Button@KICK: - X: 195 - Width: 24 + X: 485 + Width: 25 Height: 25 + Background: checkbox-toggle + TooltipContainer: TOOLTIP_CONTAINER + TooltipText: Kick this player Children: Image: ImageCollection: lobby-bits ImageName: kick - X: 6 - Y: 8 + X: 7 + Y: 7