Merge pull request #3983 from pchote/polish-chat-input

Polish chat input.
This commit is contained in:
Matthias Mailänder
2013-10-24 10:25:23 -07:00
15 changed files with 167 additions and 271 deletions

View File

@@ -0,0 +1,66 @@
Container@CHAT_PANEL:
X:(WINDOW_RIGHT - WIDTH) / 2
Y:WINDOW_BOTTOM - HEIGHT - 15
Width:550
Height:194
Logic:IngameChatLogic
Children:
Container@CHAT_OVERLAY:
Width:PARENT_RIGHT-24
Height:PARENT_BOTTOM-25
Visible:false
Children:
ChatDisplay@CHAT_DISPLAY:
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
RemoveTime:250
UseContrast: yes
Container@CHAT_CHROME:
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Children:
Button@CHAT_MODE:
Y:PARENT_BOTTOM - HEIGHT
Width:50
Height:25
Text:Team
Font:Bold
TextField@CHAT_TEXTFIELD:
X:55
Y:PARENT_BOTTOM - HEIGHT
Width:466
Height:25
Button@CHAT_CLOSE:
X:526
Y:PARENT_BOTTOM - HEIGHT
Width:24
Height:25
Children:
Image:
ImageCollection:lobby-bits
ImageName:kick
X:6
Y:8
ScrollPanel@CHAT_SCROLLPANEL:
Y:PARENT_BOTTOM - HEIGHT - 30
Width:550
Height:164
ItemSpacing:4
Align:Bottom
Children:
Container@CHAT_TEMPLATE:
X:2
Width:PARENT_RIGHT-27
Height:16
Children:
Label@NAME:
X:3
Width:50
Height:15
VAlign:Top
Label@TEXT:
X:12
Width:PARENT_RIGHT - 17
Height:15
WordWrap:true
VAlign:Top

View File

@@ -7,21 +7,6 @@ Container@INGAME_ROOT:
StrategicProgress@STRATEGIC_PROGRESS:
X: WINDOW_RIGHT/2
Y: 40
ChatDisplay@CHAT_DISPLAY:
X:250
Y:WINDOW_BOTTOM - HEIGHT - 30
Width: 760
Height: 200
DrawBackground: False
RemoveTime:250
UseContrast: yes
Notification: scold1.aud
ChatEntry@CHAT_ENTRY:
X:250
Y:WINDOW_BOTTOM - HEIGHT
Width: 760
Height: 30
UseContrast: yes
Container@PERFORMANCE_INFO:
Logic:PerfDebugLogic
Children:

View File

@@ -293,20 +293,6 @@ Container@SETTINGS_PANEL:
Height:25
Font:Regular
Text:Enabled
Label@KEYBOARD_TITLE:
X:375
Y:20
Width:340
Font:Bold
Text:Keyboard Input
Align:Center
Checkbox@TEAMCHAT_CHECKBOX:
X:375
Y:35
Width:240
Height:20
Font:Regular
Text:Shift-Enter Toggles Team Chat
Button@GENERAL_BUTTON:
Y:319
Width:140

View File

@@ -76,6 +76,7 @@ ChromeLayout:
mods/cnc/chrome/mapchooser.yaml
mods/cnc/chrome/replaybrowser.yaml
mods/cnc/chrome/ingame.yaml
mods/cnc/chrome/ingame-chat.yaml
mods/cnc/chrome/ingamemenu.yaml
mods/cnc/chrome/music.yaml
mods/cnc/chrome/modchooser.yaml

View File

@@ -2,59 +2,50 @@ Container@CHAT_PANEL:
X:(WINDOW_RIGHT - WIDTH) / 2
Y:WINDOW_BOTTOM - HEIGHT - 15
Width:550
Height:180
Height:194
Logic:IngameChatLogic
Children:
Container@CHAT_OVERLAY:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM-30
Visible: false
Width:PARENT_RIGHT-24
Height:PARENT_BOTTOM-25
Visible:false
Children:
ChatDisplay@CHAT_DISPLAY:
X:0
Y:0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
DrawBackground: False
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
RemoveTime:250
UseContrast: yes
Container@CHAT_CHROME:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Children:
Button@CHAT_MODE:
X:0
Y:PARENT_BOTTOM - HEIGHT
Width: 50
Height: 25
Text: Team
Font: Bold
Width:50
Height:25
Text:Team
Font:Bold
TextField@CHAT_TEXTFIELD:
X:55
Y:PARENT_BOTTOM - HEIGHT
Width:465
Width:466
Height:25
Button@CHAT_CLOSE:
X:525
X:526
Y:PARENT_BOTTOM - HEIGHT
Width: 25
Height: 25
Text: X
Font: Bold
Width:24
Height:25
Text:X
Font:Bold
ScrollPanel@CHAT_SCROLLPANEL:
X:0
Y:PARENT_BOTTOM - HEIGHT - 30
Width:550
Height:150
ItemSpacing:1
Height:164
ItemSpacing:4
Align:Bottom
Children:
Container@CHAT_TEMPLATE:
X:2
Y:0
Width:PARENT_RIGHT-27
Height:16
Children:
@@ -64,8 +55,8 @@ Container@CHAT_PANEL:
Height:15
VAlign:Top
Label@TEXT:
X:10
Width:PARENT_RIGHT - 60
X:12
Width:PARENT_RIGHT - 17
Height:15
WordWrap:true
VAlign:Top

View File

@@ -104,12 +104,6 @@ Background@SETTINGS_MENU:
Width:200
Height:20
Text: Invert Mouse Drag Scrolling
Checkbox@TEAMCHAT_TOGGLE:
X:0
Y:120
Width:200
Height:20
Text: Shift-Enter Toggles Team Chat
Checkbox@SHOW_SHELLMAP:
X:0
Y:150