Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix "game" chat tab mouseover not working from globalchat login tab. #13185

Merged
merged 2 commits into from May 27, 2017
Merged

Fix "game" chat tab mouseover not working from globalchat login tab. #13185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb31037
Fix "game" chat tab mouseover not working from globalchat login tab.
pchote May 25, 2017
1a0d1f3
Fix bogus variable names in widget widths.
pchote May 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
76 changes: 40 additions & 36 deletions mods/cnc/chrome/lobby-globalchat.yaml
View file
Open in desktop
Expand Up @@ -22,13 +22,13 @@ Container@LOBBY_GLOBALCHAT_PANEL:
ScrollPanel@HISTORY_PANEL:
Y: 19
Width: 582
Height: PARENT_BOTTOM - 19
Height: PARENT_BOTTOM - 49
TopBottomSpacing: 4
ItemSpacing: 4
Children:
Container@CHAT_TEMPLATE:
X: 2
Width: PARENT_RIGHT-27
Width: PARENT_RIGHT - 27
Height: 16
Children:
Label@TIME:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mods/cnc/chrome/lobby.yaml
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mods/cnc/chrome/multiplayer-globalchat.yaml
View file
Open in desktop
Expand Up @@ -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:
Expand Down
70 changes: 37 additions & 33 deletions mods/common/chrome/lobby-globalchat.yaml
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions mods/common/chrome/lobby.yaml
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mods/common/chrome/multiplayer-globalchat.yaml
View file
Open in desktop
Expand Up @@ -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:
Expand Down