Merge pull request #2879 from bidifx/chat

closes #2874: improved ingame chat

mods/cnc-classic/mod.yaml

@@ -65,6 +65,7 @@ Assemblies:
 ChromeLayout:
 	mods/ra/chrome/gameinit.yaml
 	mods/ra/chrome/ingame.yaml
+	mods/ra/chrome/ingame-chat.yaml
 	mods/ra/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/ra/chrome/lobby.yaml

mods/d2k/mod.yaml

@@ -54,6 +54,7 @@ Assemblies:
 ChromeLayout:
 	mods/d2k/chrome/gameinit.yaml
 	mods/ra/chrome/ingame.yaml
+	mods/ra/chrome/ingame-chat.yaml
 	mods/d2k/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/d2k/chrome/lobby.yaml
@@ -114,4 +115,4 @@ Fonts:
 		Size:10
 	TinyBold:
 		Font:FreeSansBold.ttf
-		Size:10
+		Size:10

mods/ra-classic/mod.yaml

@@ -56,6 +56,7 @@ Assemblies:
 ChromeLayout:
 	mods/ra/chrome/gameinit.yaml
 	mods/ra/chrome/ingame.yaml
+	mods/ra/chrome/ingame-chat.yaml
 	mods/ra/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/ra/chrome/lobby.yaml

mods/ra/chrome/ingame-chat.yaml

@@ -0,0 +1,71 @@
+Container@CHAT_PANEL:
+	X:(WINDOW_RIGHT - WIDTH) / 2
+	Y:WINDOW_BOTTOM - HEIGHT - 15
+	Width:550
+	Height:180
+	Logic:IngameChatLogic
+	Children:
+		Container@CHAT_OVERLAY:
+			X:0
+			Y:0
+			Width:PARENT_RIGHT
+			Height:PARENT_BOTTOM-30
+			Visible: false
+			Children:
+				ChatDisplay@CHAT_DISPLAY:
+					X:0
+					Y:0
+					Width: PARENT_RIGHT
+					Height: PARENT_BOTTOM
+					DrawBackground: False
+					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
+				TextField@CHAT_TEXTFIELD:
+					X:55
+					Y:PARENT_BOTTOM - HEIGHT
+					Width:465
+					Height:25
+				Button@CHAT_CLOSE:
+					X:525
+					Y:PARENT_BOTTOM - HEIGHT
+					Width: 25
+					Height: 25
+					Text: X
+					Font: Bold
+				ScrollPanel@CHAT_SCROLLPANEL:
+					X:0
+					Y:PARENT_BOTTOM - HEIGHT - 30
+					Width:550
+					Height:150
+					ItemSpacing:1
+					Children:
+						Container@CHAT_TEMPLATE:
+							X:2
+							Y:0
+							Width:PARENT_RIGHT-27
+							Height:16
+							Children:
+								Label@NAME:
+									X:3
+									Width:50
+									Height:15
+									VAlign:Top
+								Label@TEXT:
+									X:10
+									Width:PARENT_RIGHT - 60
+									Height:15
+									WordWrap:true
+									VAlign:Top

mods/ra/chrome/ingame.yaml

@@ -206,20 +206,6 @@ Container@INGAME_ROOT:
 					Text:Close
 					Font:Bold
 					Key:escape
-		ChatDisplay@CHAT_DISPLAY:
-			X:250
-			Y:WINDOW_BOTTOM - HEIGHT - 30
-			Width: 760
-			Height: 200
-			DrawBackground: False
-			RemoveTime:250
-			UseContrast: yes
-		ChatEntry@CHAT_ENTRY:
-			X:250
-			Y:WINDOW_BOTTOM - HEIGHT
-			Width: 760
-			Height: 30
-			UseContrast: yes
 		Background@PERF_BG:
 			ClickThrough:true
 			Background:dialog4
@@ -373,20 +359,6 @@ Container@OBSERVER_ROOT:
 					Height:25
 					Text:Abort Mission
 					Font:Bold
-		ChatDisplay@CHAT_DISPLAY:
-			X:250
-			Y:WINDOW_BOTTOM - HEIGHT - 30
-			Width: 760
-			Height: 200
-			DrawBackground: False
-			RemoveTime:250
-			UseContrast: yes
-		ChatEntry@CHAT_ENTRY:
-			X:250
-			Y:WINDOW_BOTTOM - HEIGHT
-			Width: 760
-			Height: 30
-			UseContrast: yes
 		Background@PERF_BG:
 			ClickThrough:true
 			Background:dialog4

mods/ra/mod.yaml

@@ -55,6 +55,7 @@ Assemblies:
 ChromeLayout:
 	mods/ra/chrome/gameinit.yaml
 	mods/ra/chrome/ingame.yaml
+	mods/ra/chrome/ingame-chat.yaml
 	mods/ra/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/ra/chrome/lobby.yaml