Merge pull request #4986 from Mailaender/scroll-velocity

Scroll velocity polish

OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs

@@ -36,7 +36,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			widget.Get<ButtonWidget>("BUTTON_CANCEL").OnClick = () => { Ui.CloseWindow(); onExit(); };
 
 			scrollpanel = widget.Get<ScrollPanelWidget>("MAP_LIST");
-			scrollpanel.ScrollVelocity = 40f;
 			scrollpanel.Layout = new GridLayout(scrollpanel);
 
 			itemTemplate = scrollpanel.Get<ScrollItemWidget>("MAP_TEMPLATE");

OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.RA.Widgets
 	public enum ResourceBarStyle { Flat, Bevelled }
 	public class ResourceBarWidget : Widget
 	{
-		public readonly string TooltipTemplate = "SIMPLE_TOOLTIP";
+		public readonly string TooltipTemplate;
 		public readonly string TooltipContainer;
 		Lazy<TooltipContainerWidget> tooltipContainer;
 

mods/cnc/chrome/ingame.yaml

@@ -276,6 +276,7 @@ Container@PLAYER_WIDGETS:
 							Width:PARENT_RIGHT-2
 							Height:PARENT_BOTTOM-2
 							TooltipContainer:TOOLTIP_CONTAINER
+							TooltipTemplate:SIMPLE_TOOLTIP
 							IndicatorImage:indicator-left
 				Background@SILOBAR_PANEL:
 					X:180
@@ -290,6 +291,7 @@ Container@PLAYER_WIDGETS:
 							Width:PARENT_RIGHT-2
 							Height:PARENT_BOTTOM-2
 							TooltipContainer:TOOLTIP_CONTAINER
+							TooltipTemplate:SIMPLE_TOOLTIP
 							IndicatorImage:indicator-right
 				Label@CASH:
 					Y:170

mods/cnc/chrome/mapchooser.yaml

@@ -35,6 +35,7 @@ Container@MAPCHOOSER_PANEL:
 					Y:45
 					Width:PARENT_RIGHT - 30
 					Height:440
+					ScrollVelocity:40
 					Children:
 						ScrollItem@MAP_TEMPLATE:
 							Width:168

mods/cnc/chrome/serverbrowser.yaml

@@ -59,6 +59,7 @@ Container@SERVERBROWSER_PANEL:
 					Y:15
 					Width:700
 					Height:440
+					ScrollVelocity:20
 					Children:
 						ScrollItem@SERVER_TEMPLATE:
 							Width:PARENT_RIGHT-27

mods/d2k/chrome/ingame-player.yaml

@@ -49,6 +49,7 @@ Container@PLAYER_WIDGETS:
 					Width:138
 					Height:5
 					TooltipContainer:TOOLTIP_CONTAINER
+					TooltipTemplate:SIMPLE_TOOLTIP
 					IndicatorImage:power-indicator
 					Orientation:Horizontal
 					Style:Bevelled

mods/ra/chrome/ingame-player.yaml

@@ -49,6 +49,7 @@ Container@PLAYER_WIDGETS:
 					Width:138
 					Height:5
 					TooltipContainer:TOOLTIP_CONTAINER
+					TooltipTemplate:SIMPLE_TOOLTIP
 					IndicatorImage:power-indicator
 					Orientation:Horizontal
 					Style:Bevelled

mods/ra/chrome/map-chooser.yaml

@@ -18,6 +18,7 @@ Background@MAPCHOOSER_PANEL:
 			Y:47
 			Width:PARENT_RIGHT - 40
 			Height:474
+			ScrollVelocity:40
 			Children:
 				ScrollItem@MAP_TEMPLATE:
 					Width:180

mods/ra/chrome/serverbrowser.yaml

@@ -49,6 +49,7 @@ Background@SERVERBROWSER_PANEL:
 			Y:80
 			Width:700
 			Height:360
+			ScrollVelocity:20
 			Children:
 				ScrollItem@SERVER_TEMPLATE:
 					Width:PARENT_RIGHT-27