Merge pull request #3525 from pchote/ra-widget-cleanup

Widget fixes

mods/ra/chrome.yaml

@@ -2,15 +2,10 @@ chrome-allies: chrome-allies.png
 	specialbin-top: 0,0,30,51
 	specialbin-middle: 0,51,30,51
 	specialbin-bottom: 0,153,30,39
-	moneybin: 192,0,320,32
+	moneybin: 192,0,320,31
+	radar: 297,31,210,222
 	tooltip-bg: 0,288,272,136
 
-radar-allies: chrome-allies.png
-	left: 297,31,9,192
-	right: 498,31,9,192
-	bottom: 297,223,210,30
-	bg: 306,31,192,192
-
 power-allies: chrome-allies.png
 	power-indicator: 187,4,4,7
 
@@ -44,16 +39,10 @@ chrome-soviet: chrome-soviet.png
 	specialbin-top: 0,0,30,51
 	specialbin-middle: 0,51,30,51
 	specialbin-bottom: 0,153,30,39
-	moneybin: 192,0,320,32
+	moneybin: 192,0,320,31
+	radar: 297,31,210,222
 	tooltip-bg: 0,288,272,136
 
-radar-soviet: chrome-soviet.png
-	left: 297,31,9,192
-	right: 498,31,9,192
-	bottom: 297,223,210,30
-	bg: 306,31,192,192
-	power-indicator: 187,4,4,7
-
 power-soviet: chrome-soviet.png
 	power-indicator: 187,4,4,7
 

mods/ra/chrome/ingame.yaml

@@ -51,10 +51,11 @@ Container@INGAME_ROOT:
 					Y:205
 					Width:170
 					Height:40
+		TooltipContainer@TOOLTIP_CONTAINER:
 
 Container@PLAYER_WIDGETS:
 	Children:
-		LogicTicker@WIN_LOSS_WATCHER:
+		LogicTicker@SIDEBAR_TICKER:
 		Button@INGAME_DIPLOMACY_BUTTON:
 			X:162
 			Y:0
@@ -81,9 +82,29 @@ Container@PLAYER_WIDGETS:
 			Visible:false
 			Font:Bold
 			Key: f3
-		RadarBin@INGAME_RADAR_BIN:
-			WorldInteractionController:INTERACTION_CONTROLLER
-		PowerBin@INGAME_POWER_BIN:
+		SlidingContainer@INGAME_RADAR_BIN:
+			X:WINDOW_RIGHT-215
+			Y:0
+			OpenOffset:0,29
+			ClosedOffset:0,-166
+			AnimationLength:15
+			Children:
+				Image@RADAR_BIN_BG:
+					ImageName:radar
+				Radar@RADAR_MINIMAP:
+					WorldInteractionController:INTERACTION_CONTROLLER
+					X:9
+					Width:192
+					Height:192
+				ResourceBar@POWERBAR:
+					X:42
+					Y:205
+					Width:138
+					Height:5
+					TooltipContainer:TOOLTIP_CONTAINER
+					IndicatorImage:power-indicator
+					Orientation:Horizontal
+					Style:Bevelled
 		MoneyBin@INGAME_MONEY_BIN:
 			X:WINDOW_RIGHT - WIDTH
 			Y:0

mods/ra/chrome/lobby-dialogs.yaml

@@ -68,19 +68,19 @@ Background@LOBBY_OPTIONS_BIN:
 		Checkbox@ALLOWCHEATS_CHECKBOX:
 			X:150
 			Y:80
-			Width:80
+			Width:220
 			Height:20
 			Text:Enable Cheats / Debug Menu
 		Checkbox@CRATES_CHECKBOX:
 			X:150
 			Y:110
-			Width:80
+			Width:220
 			Height:20
 			Text:Enable Crates
 		Checkbox@FRAGILEALLIANCES_CHECKBOX:
 			X:150
 			Y:140
-			Width:80
+			Width:220
 			Height:20
 			Text:Allow Team Changes
 		Label@DIFFICULTY_DESC:

mods/ra/chrome/tooltips.yaml

@@ -1,3 +1,14 @@
+Background@SIMPLE_TOOLTIP:
+	Logic:SimpleTooltipLogic
+	Background:dialog4
+	Height:29
+	Children:
+		Label@LABEL:
+			X:7
+			Y:2
+			Height:23
+			Font:Bold
+
 Background@SPAWN_TOOLTIP:
 	Logic:SpawnSelectorTooltipLogic
 	Background:dialog4