From d514689ec7db5fcdaf84c2ad18b31a000eae0b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 21 Jan 2014 15:22:05 +0100 Subject: [PATCH 1/3] hard-coded ScrollVelocity to YAML --- OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs | 1 - mods/cnc/chrome/mapchooser.yaml | 1 + mods/ra/chrome/map-chooser.yaml | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs index 9e4b829bfc..099d62ed69 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs @@ -36,7 +36,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic widget.Get("BUTTON_CANCEL").OnClick = () => { Ui.CloseWindow(); onExit(); }; scrollpanel = widget.Get("MAP_LIST"); - scrollpanel.ScrollVelocity = 40f; scrollpanel.Layout = new GridLayout(scrollpanel); itemTemplate = scrollpanel.Get("MAP_TEMPLATE"); diff --git a/mods/cnc/chrome/mapchooser.yaml b/mods/cnc/chrome/mapchooser.yaml index c78eb97746..d3053f202b 100644 --- a/mods/cnc/chrome/mapchooser.yaml +++ b/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 diff --git a/mods/ra/chrome/map-chooser.yaml b/mods/ra/chrome/map-chooser.yaml index b1d4b6ff58..1800f225ab 100644 --- a/mods/ra/chrome/map-chooser.yaml +++ b/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 From 64b4f62af09ec0e5887431bb8c6704dbf48db011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 29 Mar 2014 20:02:52 +0100 Subject: [PATCH 2/3] hard-coded TooltipTemplate to YAML --- OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs | 2 +- mods/cnc/chrome/ingame.yaml | 2 ++ mods/d2k/chrome/ingame-player.yaml | 1 + mods/ra/chrome/ingame-player.yaml | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs b/OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs index ff51d1615d..84ec4f1693 100755 --- a/OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs +++ b/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 tooltipContainer; diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index 4c2c4a8732..8d53f5ac7b 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/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 diff --git a/mods/d2k/chrome/ingame-player.yaml b/mods/d2k/chrome/ingame-player.yaml index b4b2c54a68..201dabcb74 100644 --- a/mods/d2k/chrome/ingame-player.yaml +++ b/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 diff --git a/mods/ra/chrome/ingame-player.yaml b/mods/ra/chrome/ingame-player.yaml index e50f119644..3b9ac9449e 100644 --- a/mods/ra/chrome/ingame-player.yaml +++ b/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 From 98a3d7d55df31cd70d4b31f7f600fd5cc104c380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 29 Mar 2014 20:06:17 +0100 Subject: [PATCH 3/3] scroll the game server list faster closes #3462 --- mods/cnc/chrome/serverbrowser.yaml | 1 + mods/ra/chrome/serverbrowser.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/mods/cnc/chrome/serverbrowser.yaml b/mods/cnc/chrome/serverbrowser.yaml index 276f3b20bf..f586144cd9 100644 --- a/mods/cnc/chrome/serverbrowser.yaml +++ b/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 diff --git a/mods/ra/chrome/serverbrowser.yaml b/mods/ra/chrome/serverbrowser.yaml index 8af64582df..7bb175543e 100644 --- a/mods/ra/chrome/serverbrowser.yaml +++ b/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