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

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

Browse Source
This commit is contained in:
Paul Chote
2017-05-25 20:24:52 +00:00
committed by abcdefg30
parent b104f8baa2
commit 29d827079e
4 changed files with 78 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
mods/cnc/chrome/lobby-globalchat.yaml
View File

@@ -22,7 +22,7 @@ Container@LOBBY_GLOBALCHAT_PANEL:
ScrollPanel@HISTORY_PANEL: ScrollPanel@HISTORY_PANEL:
Y: 19 Y: 19
Width: 582 Width: 582
Height: PARENT_BOTTOM - 19 Height: PARENT_BOTTOM - 49
TopBottomSpacing: 4 TopBottomSpacing: 4
ItemSpacing: 4 ItemSpacing: 4
Children: Children:
@@ -52,7 +52,7 @@ Container@LOBBY_GLOBALCHAT_PANEL:
Shadow: True Shadow: True
TextField@CHAT_TEXTFIELD: TextField@CHAT_TEXTFIELD:
X: 200 X: 200
Y: PARENT_BOTTOM + 5 Y: PARENT_BOTTOM - 25
Width: 382 Width: 382
Height: 25 Height: 25
LeftMargin: 60 LeftMargin: 60
@@ -66,7 +66,7 @@ Container@LOBBY_GLOBALCHAT_PANEL:
ScrollPanel@NICKNAME_PANEL: ScrollPanel@NICKNAME_PANEL:
X: 596 X: 596
Width: PARENT_RIGHT - 596 Width: PARENT_RIGHT - 596
Height: PARENT_BOTTOM Height: PARENT_BOTTOM - 30
Children: Children:
Container@NICKNAME_TEMPLATE: Container@NICKNAME_TEMPLATE:
Height: 20 Height: 20
@@ -83,48 +83,52 @@ Container@LOBBY_GLOBALCHAT_PANEL:
Height: 20 Height: 20
Button@DISCONNECT_BUTTON: Button@DISCONNECT_BUTTON:
X: 596 X: 596
Y: PARENT_BOTTOM + 5 Y: PARENT_BOTTOM - 25
Width: PARENT_RIGHT - 596 Width: PARENT_RIGHT - 596
Height: 25 Height: 25
Text: Leave Chat Text: Leave Chat
Font: Bold Font: Bold
Background@GLOBALCHAT_CONNECT_PANEL: Container@GLOBALCHAT_CONNECT_PANEL:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Background: scrollpanel-bg
Children: Children:
Label@GLOBAL_CHAT_LABEL: Background:
Y: PARENT_BOTTOM / 4
Width: PARENT_RIGHT Width: PARENT_RIGHT
Align: Center Height: PARENT_BOTTOM - 30
Text: Global Chat Background: scrollpanel-bg
Font: Bold Children:
Label@NICKNAME_LABEL: Label@GLOBAL_CHAT_LABEL:
X: 200 Y: PARENT_BOTTOM / 4
Y: PARENT_BOTTOM / 4 + 35 Width: PARENT_RIGHT
Text: Nickname: Align: Center
TextField@NICKNAME_TEXTFIELD: Text: Global Chat
X: 270 Font: Bold
Y: PARENT_BOTTOM / 4 + 25 Label@NICKNAME_LABEL:
Width: 150 X: 200
Height: 25 Y: PARENT_BOTTOM / 4 + 35
Checkbox@CONNECT_AUTOMATICALLY_CHECKBOX: Text: Nickname:
X: 270 TextField@NICKNAME_TEXTFIELD:
Y: PARENT_BOTTOM / 4 + 75 X: 270
Height: 20 Y: PARENT_BOTTOM / 4 + 25
Width: 180 Width: 150
Font: Regular Height: 25
Text: Connect Automatically Checkbox@CONNECT_AUTOMATICALLY_CHECKBOX:
Button@CONNECT_BUTTON: X: 270
X: 430 Y: PARENT_BOTTOM / 4 + 75
Y: PARENT_BOTTOM / 4 + 25 Height: 20
Width: 100 Width: 180
Height: 25 Font: Regular
Text: Connect Text: Connect Automatically
Font: Bold Button@CONNECT_BUTTON:
X: 430
Y: PARENT_BOTTOM / 4 + 25
Width: 100
Height: 25
Text: Connect
Font: Bold
TextField@FAKE_CHAT: TextField@FAKE_CHAT:
X: 200 X: 200
Y: PARENT_BOTTOM + 5 Y: PARENT_BOTTOM - 25
Width: PARENT_RIGHT - 200 Width: PARENT_RIGHT - 200
Height: 25 Height: 25
LeftMargin: 60 LeftMargin: 60

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

@@ -123,7 +123,7 @@ Container@SERVER_LOBBY:
X: 15 X: 15
Y: 285 Y: 285
Width: PARENT_RIGHT - 30 Width: PARENT_RIGHT - 30
Height: PARENT_BOTTOM - 330 Height: PARENT_BOTTOM - 300
Button@DISCONNECT_BUTTON: Button@DISCONNECT_BUTTON:
Y: PARENT_BOTTOM - 36 Y: PARENT_BOTTOM - 36
Width: 140 Width: 140

68
mods/common/chrome/lobby-globalchat.yaml
View File

@@ -5,7 +5,7 @@ Container@LOBBY_GLOBALCHAT_PANEL:
Children: Children:
Container@GLOBALCHAT_MAIN_PANEL: Container@GLOBALCHAT_MAIN_PANEL:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: PARENT_BOTTOM - 30
Children: Children:
Background@TOPIC: Background@TOPIC:
Width: 582 Width: 582
@@ -88,43 +88,47 @@ Container@LOBBY_GLOBALCHAT_PANEL:
Height: 25 Height: 25
Text: Leave Chat Text: Leave Chat
Font: Bold Font: Bold
Background@GLOBALCHAT_CONNECT_PANEL: Container@GLOBALCHAT_CONNECT_PANEL:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM - 30 Height: PARENT_BOTTOM - 30
Background: scrollpanel-bg
Children: Children:
Label@GLOBAL_CHAT_LABEL: Background:
Y: PARENT_BOTTOM / 4
Width: PARENT_RIGHT Width: PARENT_RIGHT
Align: Center Height: PARENT_BOTTOM - 30
Text: Global Chat Background: scrollpanel-bg
Font: Bold Children:
Label@NICKNAME_LABEL: Label@GLOBAL_CHAT_LABEL:
X: 200 Y: PARENT_BOTTOM / 4
Y: PARENT_BOTTOM / 4 + 35 Width: PARENT_RIGHT
Text: Nickname: Align: Center
TextField@NICKNAME_TEXTFIELD: Text: Global Chat
X: 270 Font: Bold
Y: PARENT_BOTTOM / 4 + 25 Label@NICKNAME_LABEL:
Width: 150 X: 200
Height: 25 Y: PARENT_BOTTOM / 4 + 35
Checkbox@CONNECT_AUTOMATICALLY_CHECKBOX: Text: Nickname:
X: 270 TextField@NICKNAME_TEXTFIELD:
Y: PARENT_BOTTOM / 4 + 75 X: 270
Height: 20 Y: PARENT_BOTTOM / 4 + 25
Width: 180 Width: 150
Font: Regular Height: 25
Text: Connect Automatically Checkbox@CONNECT_AUTOMATICALLY_CHECKBOX:
Button@CONNECT_BUTTON: X: 270
X: 430 Y: PARENT_BOTTOM / 4 + 75
Y: PARENT_BOTTOM / 4 + 25 Height: 20
Width: 100 Width: 180
Height: 25 Font: Regular
Text: Connect Text: Connect Automatically
Font: Bold Button@CONNECT_BUTTON:
X: 430
Y: PARENT_BOTTOM / 4 + 25
Width: 100
Height: 25
Text: Connect
Font: Bold
TextField@FAKE_CHAT: TextField@FAKE_CHAT:
X: 205 X: 205
Y: PARENT_BOTTOM + 5 Y: PARENT_BOTTOM - 25
Width: PARENT_RIGHT - 205 Width: PARENT_RIGHT - 205
Height: 25 Height: 25
LeftMargin: 60 LeftMargin: 60

4
mods/common/chrome/lobby.yaml
View File

@@ -122,9 +122,9 @@ Background@SERVER_LOBBY:
Text: Chat: Text: Chat:
Container@GLOBALCHAT_ROOT: Container@GLOBALCHAT_ROOT:
X: 20 X: 20
Y: PARENT_BOTTOM - HEIGHT - 50 Y: PARENT_BOTTOM - HEIGHT - 20
Width: PARENT_RIGHT - 40 Width: PARENT_RIGHT - 40
Height: 229 Height: 259
Button@START_GAME_BUTTON: Button@START_GAME_BUTTON:
X: PARENT_RIGHT - WIDTH - 150 X: PARENT_RIGHT - WIDTH - 150
Y: PARENT_BOTTOM - HEIGHT - 20 Y: PARENT_BOTTOM - HEIGHT - 20