From fb31037bb41812380860b68a758097fe22fdc2dc Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 25 May 2017 20:24:52 +0000 Subject: [PATCH 1/2] Fix "game" chat tab mouseover not working from globalchat login tab. --- mods/cnc/chrome/lobby-globalchat.yaml | 74 +++++++++++++----------- mods/cnc/chrome/lobby.yaml | 2 +- mods/common/chrome/lobby-globalchat.yaml | 68 ++++++++++++---------- mods/common/chrome/lobby.yaml | 4 +- 4 files changed, 78 insertions(+), 70 deletions(-) diff --git a/mods/cnc/chrome/lobby-globalchat.yaml b/mods/cnc/chrome/lobby-globalchat.yaml index 29f4d7dac2fa..297bce2cf13a 100644 --- a/mods/cnc/chrome/lobby-globalchat.yaml +++ b/mods/cnc/chrome/lobby-globalchat.yaml @@ -22,7 +22,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: ScrollPanel@HISTORY_PANEL: Y: 19 Width: 582 - Height: PARENT_BOTTOM - 19 + Height: PARENT_BOTTOM - 49 TopBottomSpacing: 4 ItemSpacing: 4 Children: @@ -52,7 +52,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: Shadow: True TextField@CHAT_TEXTFIELD: X: 200 - Y: PARENT_BOTTOM + 5 + Y: PARENT_BOTTOM - 25 Width: 382 Height: 25 LeftMargin: 60 @@ -66,7 +66,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: ScrollPanel@NICKNAME_PANEL: X: 596 Width: PARENT_RIGHT - 596 - Height: PARENT_BOTTOM + Height: PARENT_BOTTOM - 30 Children: Container@NICKNAME_TEMPLATE: Height: 20 @@ -83,48 +83,52 @@ Container@LOBBY_GLOBALCHAT_PANEL: Height: 20 Button@DISCONNECT_BUTTON: X: 596 - Y: PARENT_BOTTOM + 5 + Y: PARENT_BOTTOM - 25 Width: PARENT_RIGHT - 596 Height: 25 Text: Leave Chat Font: Bold - Background@GLOBALCHAT_CONNECT_PANEL: + Container@GLOBALCHAT_CONNECT_PANEL: Width: PARENT_RIGHT Height: PARENT_BOTTOM - Background: scrollpanel-bg Children: - Label@GLOBAL_CHAT_LABEL: - Y: PARENT_BOTTOM / 4 + Background: Width: PARENT_RIGHT - Align: Center - Text: Global Chat - Font: Bold - Label@NICKNAME_LABEL: - X: 200 - Y: PARENT_BOTTOM / 4 + 35 - Text: Nickname: - TextField@NICKNAME_TEXTFIELD: - X: 270 - Y: PARENT_BOTTOM / 4 + 25 - Width: 150 - Height: 25 - Checkbox@CONNECT_AUTOMATICALLY_CHECKBOX: - X: 270 - Y: PARENT_BOTTOM / 4 + 75 - Height: 20 - Width: 180 - Font: Regular - Text: Connect Automatically - Button@CONNECT_BUTTON: - X: 430 - Y: PARENT_BOTTOM / 4 + 25 - Width: 100 - Height: 25 - Text: Connect - Font: Bold + Height: PARENT_BOTTOM - 30 + Background: scrollpanel-bg + Children: + Label@GLOBAL_CHAT_LABEL: + Y: PARENT_BOTTOM / 4 + Width: PARENT_RIGHT + Align: Center + Text: Global Chat + Font: Bold + Label@NICKNAME_LABEL: + X: 200 + Y: PARENT_BOTTOM / 4 + 35 + Text: Nickname: + TextField@NICKNAME_TEXTFIELD: + X: 270 + Y: PARENT_BOTTOM / 4 + 25 + Width: 150 + Height: 25 + Checkbox@CONNECT_AUTOMATICALLY_CHECKBOX: + X: 270 + Y: PARENT_BOTTOM / 4 + 75 + Height: 20 + Width: 180 + Font: Regular + Text: Connect Automatically + Button@CONNECT_BUTTON: + X: 430 + Y: PARENT_BOTTOM / 4 + 25 + Width: 100 + Height: 25 + Text: Connect + Font: Bold TextField@FAKE_CHAT: X: 200 - Y: PARENT_BOTTOM + 5 + Y: PARENT_BOTTOM - 25 Width: PARENT_RIGHT - 200 Height: 25 LeftMargin: 60 diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml index a45769064fde..2b26a0ccf885 100644 --- a/mods/cnc/chrome/lobby.yaml +++ b/mods/cnc/chrome/lobby.yaml @@ -123,7 +123,7 @@ Container@SERVER_LOBBY: X: 15 Y: 285 Width: PARENT_RIGHT - 30 - Height: PARENT_BOTTOM - 330 + Height: PARENT_BOTTOM - 300 Button@DISCONNECT_BUTTON: Y: PARENT_BOTTOM - 36 Width: 140 diff --git a/mods/common/chrome/lobby-globalchat.yaml b/mods/common/chrome/lobby-globalchat.yaml index a545de541afb..cb4bdcaeab59 100644 --- a/mods/common/chrome/lobby-globalchat.yaml +++ b/mods/common/chrome/lobby-globalchat.yaml @@ -5,7 +5,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: Children: Container@GLOBALCHAT_MAIN_PANEL: Width: PARENT_RIGHT - Height: PARENT_BOTTOM + Height: PARENT_BOTTOM - 30 Children: Background@TOPIC: Width: 582 @@ -88,43 +88,47 @@ Container@LOBBY_GLOBALCHAT_PANEL: Height: 25 Text: Leave Chat Font: Bold - Background@GLOBALCHAT_CONNECT_PANEL: + Container@GLOBALCHAT_CONNECT_PANEL: Width: PARENT_RIGHT Height: PARENT_BOTTOM - 30 - Background: scrollpanel-bg Children: - Label@GLOBAL_CHAT_LABEL: - Y: PARENT_BOTTOM / 4 + Background: Width: PARENT_RIGHT - Align: Center - Text: Global Chat - Font: Bold - Label@NICKNAME_LABEL: - X: 200 - Y: PARENT_BOTTOM / 4 + 35 - Text: Nickname: - TextField@NICKNAME_TEXTFIELD: - X: 270 - Y: PARENT_BOTTOM / 4 + 25 - Width: 150 - Height: 25 - Checkbox@CONNECT_AUTOMATICALLY_CHECKBOX: - X: 270 - Y: PARENT_BOTTOM / 4 + 75 - Height: 20 - Width: 180 - Font: Regular - Text: Connect Automatically - Button@CONNECT_BUTTON: - X: 430 - Y: PARENT_BOTTOM / 4 + 25 - Width: 100 - Height: 25 - Text: Connect - Font: Bold + Height: PARENT_BOTTOM - 30 + Background: scrollpanel-bg + Children: + Label@GLOBAL_CHAT_LABEL: + Y: PARENT_BOTTOM / 4 + Width: PARENT_RIGHT + Align: Center + Text: Global Chat + Font: Bold + Label@NICKNAME_LABEL: + X: 200 + Y: PARENT_BOTTOM / 4 + 35 + Text: Nickname: + TextField@NICKNAME_TEXTFIELD: + X: 270 + Y: PARENT_BOTTOM / 4 + 25 + Width: 150 + Height: 25 + Checkbox@CONNECT_AUTOMATICALLY_CHECKBOX: + X: 270 + Y: PARENT_BOTTOM / 4 + 75 + Height: 20 + Width: 180 + Font: Regular + Text: Connect Automatically + Button@CONNECT_BUTTON: + X: 430 + Y: PARENT_BOTTOM / 4 + 25 + Width: 100 + Height: 25 + Text: Connect + Font: Bold TextField@FAKE_CHAT: X: 205 - Y: PARENT_BOTTOM + 5 + Y: PARENT_BOTTOM - 25 Width: PARENT_RIGHT - 205 Height: 25 LeftMargin: 60 diff --git a/mods/common/chrome/lobby.yaml b/mods/common/chrome/lobby.yaml index 2071961c6622..9072ade70774 100644 --- a/mods/common/chrome/lobby.yaml +++ b/mods/common/chrome/lobby.yaml @@ -122,9 +122,9 @@ Background@SERVER_LOBBY: Text: Chat: Container@GLOBALCHAT_ROOT: X: 20 - Y: PARENT_BOTTOM - HEIGHT - 50 + Y: PARENT_BOTTOM - HEIGHT - 20 Width: PARENT_RIGHT - 40 - Height: 229 + Height: 259 Button@START_GAME_BUTTON: X: PARENT_RIGHT - WIDTH - 150 Y: PARENT_BOTTOM - HEIGHT - 20 From 1a0d1f3d8e4426839b7bc5a6268f830671ee86f0 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 25 May 2017 20:26:01 +0000 Subject: [PATCH 2/2] Fix bogus variable names in widget widths. --- mods/cnc/chrome/lobby-globalchat.yaml | 2 +- mods/cnc/chrome/multiplayer-globalchat.yaml | 2 +- mods/common/chrome/lobby-globalchat.yaml | 2 +- mods/common/chrome/multiplayer-globalchat.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/cnc/chrome/lobby-globalchat.yaml b/mods/cnc/chrome/lobby-globalchat.yaml index 297bce2cf13a..17d36497ae44 100644 --- a/mods/cnc/chrome/lobby-globalchat.yaml +++ b/mods/cnc/chrome/lobby-globalchat.yaml @@ -28,7 +28,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: Children: Container@CHAT_TEMPLATE: X: 2 - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 16 Children: Label@TIME: diff --git a/mods/cnc/chrome/multiplayer-globalchat.yaml b/mods/cnc/chrome/multiplayer-globalchat.yaml index 7bdc4da19ff2..b3c608ffe8df 100644 --- a/mods/cnc/chrome/multiplayer-globalchat.yaml +++ b/mods/cnc/chrome/multiplayer-globalchat.yaml @@ -28,7 +28,7 @@ Container@GLOBALCHAT_PANEL: Children: Container@CHAT_TEMPLATE: X: 2 - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 16 Children: Label@TIME: diff --git a/mods/common/chrome/lobby-globalchat.yaml b/mods/common/chrome/lobby-globalchat.yaml index cb4bdcaeab59..8ebb4617d9d0 100644 --- a/mods/common/chrome/lobby-globalchat.yaml +++ b/mods/common/chrome/lobby-globalchat.yaml @@ -28,7 +28,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: Children: Container@CHAT_TEMPLATE: X: 2 - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 16 Children: Label@TIME: diff --git a/mods/common/chrome/multiplayer-globalchat.yaml b/mods/common/chrome/multiplayer-globalchat.yaml index 60f9a65ddaf3..b9ad2b261c56 100644 --- a/mods/common/chrome/multiplayer-globalchat.yaml +++ b/mods/common/chrome/multiplayer-globalchat.yaml @@ -28,7 +28,7 @@ Container@GLOBALCHAT_PANEL: Children: Container@CHAT_TEMPLATE: X: 2 - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 16 Children: Label@TIME: