From b6f463729b7cc3ed8a29dd45fa0ca39fe35332a9 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Tue, 20 Oct 2015 22:57:25 +0100 Subject: [PATCH] Add a ChromeLogic base class for chrome logic. --- OpenRA.Game/Widgets/Widget.cs | 13 +++++++++---- .../Widgets/Logic/ProductionTabsLogic.cs | 2 +- .../Widgets/Logic/AssetBrowserLogic.cs | 2 +- .../Widgets/Logic/ButtonTooltipLogic.cs | 2 +- .../Widgets/Logic/ColorPickerLogic.cs | 2 +- OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs | 4 ++-- OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs | 2 +- .../Widgets/Logic/DirectConnectLogic.cs | 2 +- .../Widgets/Logic/DisconnectWatcherLogic.cs | 2 +- .../Widgets/Logic/Editor/ActorSelectorLogic.cs | 2 +- .../Widgets/Logic/Editor/LayerSelectorLogic.cs | 2 +- .../Widgets/Logic/Editor/MapEditorLogic.cs | 2 +- .../Widgets/Logic/Editor/MapEditorTabsLogic.cs | 2 +- .../Widgets/Logic/Editor/NewMapLogic.cs | 2 +- .../Widgets/Logic/Editor/SaveMapLogic.cs | 2 +- .../Widgets/Logic/Editor/TileSelectorLogic.cs | 2 +- .../Widgets/Logic/FactionTooltipLogic.cs | 2 +- OpenRA.Mods.Common/Widgets/Logic/GlobalChatLogic.cs | 6 ++++-- .../Widgets/Logic/Ingame/AddFactionSuffixLogic.cs | 2 +- .../Widgets/Logic/Ingame/ClassicProductionLogic.cs | 2 +- .../Widgets/Logic/Ingame/ControlGroupLogic.cs | 2 +- .../Widgets/Logic/Ingame/DebugMenuLogic.cs | 2 +- .../Widgets/Logic/Ingame/DiplomacyLogic.cs | 2 +- .../Widgets/Logic/Ingame/GameInfoBriefingLogic.cs | 2 +- .../Widgets/Logic/Ingame/GameInfoLogic.cs | 2 +- .../Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs | 2 +- .../Widgets/Logic/Ingame/GameInfoStatsLogic.cs | 2 +- .../Widgets/Logic/Ingame/GameTimerLogic.cs | 2 +- .../Widgets/Logic/Ingame/IngameCashCounterLogic.cs | 2 +- .../Widgets/Logic/Ingame/IngameChatLogic.cs | 2 +- .../Widgets/Logic/Ingame/IngameMenuLogic.cs | 2 +- .../Widgets/Logic/Ingame/IngamePowerBarLogic.cs | 2 +- .../Widgets/Logic/Ingame/IngamePowerCounterLogic.cs | 2 +- .../Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs | 2 +- .../Widgets/Logic/Ingame/IngameSiloBarLogic.cs | 2 +- .../Widgets/Logic/Ingame/LoadIngamePerfLogic.cs | 2 +- .../Ingame/LoadIngamePlayerOrObserverUILogic.cs | 2 +- .../Widgets/Logic/Ingame/LoadMapEditorLogic.cs | 2 +- .../Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs | 2 +- .../Logic/Ingame/ObserverShroudSelectorLogic.cs | 2 +- .../Widgets/Logic/Ingame/ObserverStatsLogic.cs | 2 +- .../Widgets/Logic/Ingame/OrderButtonsChromeLogic.cs | 8 ++++---- .../Widgets/Logic/Ingame/ProductionTooltipLogic.cs | 2 +- .../Widgets/Logic/Ingame/ReplayControlBarLogic.cs | 2 +- .../Widgets/Logic/Ingame/SupportPowerBinLogic.cs | 2 +- .../Logic/Ingame/SupportPowerTooltipLogic.cs | 2 +- .../Widgets/Logic/Ingame/WorldTooltipLogic.cs | 2 +- .../Logic/Installation/DownloadPackagesLogic.cs | 2 +- .../Logic/Installation/InstallFromCDLogic.cs | 2 +- .../Widgets/Logic/Installation/InstallLogic.cs | 2 +- .../Widgets/Logic/Installation/InstallMusicLogic.cs | 2 +- .../Widgets/Logic/Lobby/ClientTooltipLogic.cs | 2 +- .../Widgets/Logic/Lobby/KickClientLogic.cs | 2 +- .../Widgets/Logic/Lobby/KickSpectatorsLogic.cs | 2 +- .../Widgets/Logic/Lobby/LobbyLogic.cs | 2 +- .../Widgets/Logic/Lobby/LobbyMapPreviewLogic.cs | 2 +- .../Logic/Lobby/SpawnSelectorTooltipLogic.cs | 2 +- OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs | 2 +- OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs | 2 +- .../Widgets/Logic/MissionBrowserLogic.cs | 2 +- OpenRA.Mods.Common/Widgets/Logic/ModBrowserLogic.cs | 2 +- .../Widgets/Logic/MusicPlayerLogic.cs | 2 +- OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs | 2 +- .../Widgets/Logic/ReplayBrowserLogic.cs | 2 +- .../Widgets/Logic/ServerBrowserLogic.cs | 2 +- .../Widgets/Logic/ServerCreationLogic.cs | 2 +- OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs | 2 +- .../Widgets/Logic/SimpleTooltipLogic.cs | 2 +- .../Widgets/Logic/TabCompletionLogic.cs | 3 ++- 69 files changed, 85 insertions(+), 77 deletions(-) diff --git a/OpenRA.Game/Widgets/Widget.cs b/OpenRA.Game/Widgets/Widget.cs index 936173b6e3..4a4c6d6786 100644 --- a/OpenRA.Game/Widgets/Widget.cs +++ b/OpenRA.Game/Widgets/Widget.cs @@ -140,6 +140,12 @@ namespace OpenRA.Widgets } } + public class ChromeLogic : IDisposable + { + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); } + protected virtual void Dispose(bool disposing) { } + } + public abstract class Widget { public readonly List Children = new List(); @@ -151,7 +157,7 @@ namespace OpenRA.Widgets public string Width = "0"; public string Height = "0"; public string[] Logic = { }; - public object[] LogicObjects { get; private set; } + public ChromeLogic[] LogicObjects { get; private set; } public bool Visible = true; public bool IgnoreMouseOver; public bool IgnoreChildMouseOver; @@ -244,7 +250,7 @@ namespace OpenRA.Widgets args["widget"] = this; - LogicObjects = Logic.Select(l => Game.ModData.ObjectCreator.CreateObject(l, args)) + LogicObjects = Logic.Select(l => Game.ModData.ObjectCreator.CreateObject(l, args)) .ToArray(); args.Remove("widget"); @@ -486,8 +492,7 @@ namespace OpenRA.Widgets if (LogicObjects != null) foreach (var l in LogicObjects) - if (l is IDisposable) - ((IDisposable)l).Dispose(); + l.Dispose(); } public Widget GetOrNull(string id) diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs index fe93861cc0..a0584e3ea8 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs @@ -14,7 +14,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class ProductionTabsLogic + public class ProductionTabsLogic : ChromeLogic { readonly ProductionTabsWidget tabs; readonly World world; diff --git a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs index 8afcb6d4d6..df48c8a3c0 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs @@ -20,7 +20,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class AssetBrowserLogic + public class AssetBrowserLogic : ChromeLogic { static readonly string[] AllowedExtensions = { ".shp", ".r8", "tmp", ".tem", ".des", ".sno", ".int", ".jun", ".vqa" }; diff --git a/OpenRA.Mods.Common/Widgets/Logic/ButtonTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ButtonTooltipLogic.cs index 286175c55d..4442ba4b86 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ButtonTooltipLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ButtonTooltipLogic.cs @@ -12,7 +12,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ButtonTooltipLogic + public class ButtonTooltipLogic : ChromeLogic { [ObjectCreator.UseCtor] public ButtonTooltipLogic(Widget widget, ButtonWidget button) diff --git a/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs index ca36d2b443..5f173da7b1 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs @@ -16,7 +16,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ColorPickerLogic + public class ColorPickerLogic : ChromeLogic { [ObjectCreator.UseCtor] public ColorPickerLogic(Widget widget, World world, HSLColor initialColor, Action onChange, WorldRenderer worldRenderer) diff --git a/OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs index 9035ffbce1..d62973fd77 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs @@ -14,7 +14,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ConnectionLogic + public class ConnectionLogic : ChromeLogic { Action onConnect, onAbort; Action onRetry; @@ -76,7 +76,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic } } - public class ConnectionFailedLogic + public class ConnectionFailedLogic : ChromeLogic { PasswordFieldWidget passwordField; bool passwordOffsetAdjusted; diff --git a/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs index e879a66193..a4054334e8 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs @@ -15,7 +15,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class CreditsLogic + public class CreditsLogic : ChromeLogic { [ObjectCreator.UseCtor] public CreditsLogic(Widget widget, Action onExit) diff --git a/OpenRA.Mods.Common/Widgets/Logic/DirectConnectLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/DirectConnectLogic.cs index 51c255d6e9..d00e94d772 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/DirectConnectLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/DirectConnectLogic.cs @@ -13,7 +13,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class DirectConnectLogic + public class DirectConnectLogic : ChromeLogic { [ObjectCreator.UseCtor] public DirectConnectLogic(Widget widget, Action onExit, Action openLobby) diff --git a/OpenRA.Mods.Common/Widgets/Logic/DisconnectWatcherLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/DisconnectWatcherLogic.cs index 1c38f6c0ad..b25d7d782a 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/DisconnectWatcherLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/DisconnectWatcherLogic.cs @@ -13,7 +13,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class DisconnectWatcherLogic + public class DisconnectWatcherLogic : ChromeLogic { [ObjectCreator.UseCtor] public DisconnectWatcherLogic(Widget widget, OrderManager orderManager) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs index 94ea4be834..86f36e6d07 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs @@ -23,7 +23,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ActorSelectorLogic + public class ActorSelectorLogic : ChromeLogic { readonly EditorViewportControllerWidget editor; readonly DropDownButtonWidget ownersDropDown; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/LayerSelectorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/LayerSelectorLogic.cs index 66abc4b518..2e85f13950 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Editor/LayerSelectorLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/LayerSelectorLogic.cs @@ -17,7 +17,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class LayerSelectorLogic + public class LayerSelectorLogic : ChromeLogic { readonly EditorViewportControllerWidget editor; readonly Ruleset modRules; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs index 61ef32c50e..b6ef4a6048 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs @@ -16,7 +16,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class MapEditorLogic + public class MapEditorLogic : ChromeLogic { [ObjectCreator.UseCtor] public MapEditorLogic(Widget widget, World world, WorldRenderer worldRenderer) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorTabsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorTabsLogic.cs index 5edae36850..d19cd8ceed 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorTabsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorTabsLogic.cs @@ -18,7 +18,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class MapEditorTabsLogic + public class MapEditorTabsLogic : ChromeLogic { protected enum MenuType { Tiles, Layers, Actors } protected MenuType menuType = MenuType.Tiles; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/NewMapLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/NewMapLogic.cs index 6d261e3150..167d4335d3 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Editor/NewMapLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/NewMapLogic.cs @@ -21,7 +21,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class NewMapLogic + public class NewMapLogic : ChromeLogic { Widget panel; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs index fad645bbd5..aa3f0e2ee3 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs @@ -17,7 +17,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class SaveMapLogic + public class SaveMapLogic : ChromeLogic { [ObjectCreator.UseCtor] public SaveMapLogic(Widget widget, Action onSave, Action onExit, Map map, List playerDefinitions, List actorDefinitions) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/TileSelectorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/TileSelectorLogic.cs index b288485e98..968a175a6f 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Editor/TileSelectorLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/TileSelectorLogic.cs @@ -16,7 +16,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class TileSelectorLogic + public class TileSelectorLogic : ChromeLogic { readonly EditorViewportControllerWidget editor; readonly ScrollPanelWidget panel; diff --git a/OpenRA.Mods.Common/Widgets/Logic/FactionTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/FactionTooltipLogic.cs index 3a02fb9681..522c6754bc 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/FactionTooltipLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/FactionTooltipLogic.cs @@ -14,7 +14,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class FactionTooltipLogic + public class FactionTooltipLogic : ChromeLogic { [ObjectCreator.UseCtor] public FactionTooltipLogic(Widget widget, ButtonWidget button) diff --git a/OpenRA.Mods.Common/Widgets/Logic/GlobalChatLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/GlobalChatLogic.cs index 2a925fada4..4357aa0b57 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/GlobalChatLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/GlobalChatLogic.cs @@ -19,7 +19,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - class GlobalChatLogic : IDisposable + class GlobalChatLogic : ChromeLogic { readonly ScrollPanelWidget historyPanel; readonly LabelWidget historyTemplate; @@ -149,8 +149,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic } bool disposed; - public void Dispose() + protected override void Dispose(bool disposing) { + base.Dispose(disposing); + if (disposed) return; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/AddFactionSuffixLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/AddFactionSuffixLogic.cs index b5fbaa16a2..7e971a9fef 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/AddFactionSuffixLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/AddFactionSuffixLogic.cs @@ -13,7 +13,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class AddFactionSuffixLogic + public class AddFactionSuffixLogic : ChromeLogic { [ObjectCreator.UseCtor] public AddFactionSuffixLogic(Widget widget, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ClassicProductionLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ClassicProductionLogic.cs index fa4ebc8de4..d14971adf3 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ClassicProductionLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ClassicProductionLogic.cs @@ -17,7 +17,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ClassicProductionLogic + public class ClassicProductionLogic : ChromeLogic { readonly ProductionPaletteWidget palette; readonly World world; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ControlGroupLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ControlGroupLogic.cs index baca8c406b..df3c03ee6d 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ControlGroupLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ControlGroupLogic.cs @@ -14,7 +14,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ControlGroupLogic + public class ControlGroupLogic : ChromeLogic { [ObjectCreator.UseCtor] public ControlGroupLogic(Widget widget, World world, WorldRenderer worldRenderer) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs index 4c86e13c98..5113e41ffa 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs @@ -14,7 +14,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class DebugMenuLogic + public class DebugMenuLogic : ChromeLogic { [ObjectCreator.UseCtor] public DebugMenuLogic(Widget widget, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/DiplomacyLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/DiplomacyLogic.cs index 48e4998588..f949f53d2b 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/DiplomacyLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/DiplomacyLogic.cs @@ -16,7 +16,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class DiplomacyLogic + public class DiplomacyLogic : ChromeLogic { readonly World world; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs index daa56f6d85..de62fd29c6 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs @@ -12,7 +12,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - class GameInfoBriefingLogic + class GameInfoBriefingLogic : ChromeLogic { [ObjectCreator.UseCtor] public GameInfoBriefingLogic(Widget widget, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoLogic.cs index f8e15c84ac..27181dba74 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoLogic.cs @@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic { public enum IngameInfoPanel { AutoSelect, Map, Objectives, Debug } - class GameInfoLogic + class GameInfoLogic : ChromeLogic { [ObjectCreator.UseCtor] public GameInfoLogic(Widget widget, World world, IngameInfoPanel activePanel) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs index 3f68270eb4..db9b21412d 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs @@ -17,7 +17,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - class GameInfoObjectivesLogic + class GameInfoObjectivesLogic : ChromeLogic { readonly ContainerWidget template; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs index d5aeb85000..815f38a379 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs @@ -16,7 +16,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - class GameInfoStatsLogic + class GameInfoStatsLogic : ChromeLogic { [ObjectCreator.UseCtor] public GameInfoStatsLogic(Widget widget, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameTimerLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameTimerLogic.cs index bf2c8d8564..8617be8bcd 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameTimerLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameTimerLogic.cs @@ -14,7 +14,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class GameTimerLogic + public class GameTimerLogic : ChromeLogic { [ObjectCreator.UseCtor] public GameTimerLogic(Widget widget, OrderManager orderManager, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameCashCounterLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameCashCounterLogic.cs index 12e6e779db..0992343894 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameCashCounterLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameCashCounterLogic.cs @@ -13,7 +13,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class IngameCashCounterLogic + public class IngameCashCounterLogic : ChromeLogic { [ObjectCreator.UseCtor] public IngameCashCounterLogic(Widget widget, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameChatLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameChatLogic.cs index ad6b1da00f..4459d7772e 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameChatLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameChatLogic.cs @@ -18,7 +18,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class IngameChatLogic + public class IngameChatLogic : ChromeLogic { readonly OrderManager orderManager; readonly Ruleset modRules; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs index cf7916f5a5..f749f3d68a 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs @@ -18,7 +18,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class IngameMenuLogic + public class IngameMenuLogic : ChromeLogic { Widget menu; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerBarLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerBarLogic.cs index 12f72fa276..cd71c76fca 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerBarLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerBarLogic.cs @@ -14,7 +14,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class IngamePowerBarLogic + public class IngamePowerBarLogic : ChromeLogic { [ObjectCreator.UseCtor] public IngamePowerBarLogic(Widget widget, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs index cf5bfe6e20..53fbd0c810 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs @@ -14,7 +14,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class IngamePowerCounterLogic + public class IngamePowerCounterLogic : ChromeLogic { [ObjectCreator.UseCtor] public IngamePowerCounterLogic(Widget widget, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs index 6f793fcf4c..20d89addac 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs @@ -16,7 +16,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class IngameRadarDisplayLogic + public class IngameRadarDisplayLogic : ChromeLogic { [ObjectCreator.UseCtor] public IngameRadarDisplayLogic(Widget widget, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameSiloBarLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameSiloBarLogic.cs index 4732ea5586..23d17451a9 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameSiloBarLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameSiloBarLogic.cs @@ -14,7 +14,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class IngameSiloBarLogic + public class IngameSiloBarLogic : ChromeLogic { [ObjectCreator.UseCtor] public IngameSiloBarLogic(Widget widget, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePerfLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePerfLogic.cs index 107c3ff6cb..8a646801a2 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePerfLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePerfLogic.cs @@ -12,7 +12,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class LoadIngamePerfLogic + public class LoadIngamePerfLogic : ChromeLogic { [ObjectCreator.UseCtor] public LoadIngamePerfLogic(Widget widget, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs index de3b9101dd..f9feaad3e5 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs @@ -14,7 +14,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class LoadIngamePlayerOrObserverUILogic + public class LoadIngamePlayerOrObserverUILogic : ChromeLogic { bool loadingObserverWidgets = false; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadMapEditorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadMapEditorLogic.cs index 74b6320ca3..5a9a6f83ca 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadMapEditorLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadMapEditorLogic.cs @@ -12,7 +12,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class LoadMapEditorLogic + public class LoadMapEditorLogic : ChromeLogic { [ObjectCreator.UseCtor] public LoadMapEditorLogic(Widget widget, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs index cbaf3d6bec..334b68d868 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs @@ -17,7 +17,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class MenuButtonsChromeLogic + public class MenuButtonsChromeLogic : ChromeLogic { readonly World world; readonly Widget worldRoot; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverShroudSelectorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverShroudSelectorLogic.cs index 4bae0fcf9e..f2dd3d40e7 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverShroudSelectorLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverShroudSelectorLogic.cs @@ -17,7 +17,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ObserverShroudSelectorLogic + public class ObserverShroudSelectorLogic : ChromeLogic { readonly CameraOption combined, disableShroud; readonly IOrderedEnumerable> teams; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs index 3dd5acaaea..9b7f6e02f8 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs @@ -20,7 +20,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ObserverStatsLogic + public class ObserverStatsLogic : ChromeLogic { ContainerWidget basicStatsHeaders; ContainerWidget economyStatsHeaders; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/OrderButtonsChromeLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/OrderButtonsChromeLogic.cs index 0c1ee36baf..2fff99c461 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/OrderButtonsChromeLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/OrderButtonsChromeLogic.cs @@ -17,7 +17,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class SellOrderButtonLogic + public class SellOrderButtonLogic : ChromeLogic { [ObjectCreator.UseCtor] public SellOrderButtonLogic(Widget widget, World world) @@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic } } - public class RepairOrderButtonLogic + public class RepairOrderButtonLogic : ChromeLogic { [ObjectCreator.UseCtor] public RepairOrderButtonLogic(Widget widget, World world) @@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic } } - public class PowerdownOrderButtonLogic + public class PowerdownOrderButtonLogic : ChromeLogic { [ObjectCreator.UseCtor] public PowerdownOrderButtonLogic(Widget widget, World world) @@ -59,7 +59,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic } } - public class BeaconOrderButtonLogic + public class BeaconOrderButtonLogic : ChromeLogic { [ObjectCreator.UseCtor] public BeaconOrderButtonLogic(Widget widget, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ProductionTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ProductionTooltipLogic.cs index 70e69c9a98..a9afe10719 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ProductionTooltipLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ProductionTooltipLogic.cs @@ -17,7 +17,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ProductionTooltipLogic + public class ProductionTooltipLogic : ChromeLogic { [ObjectCreator.UseCtor] public ProductionTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer, ProductionPaletteWidget palette, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ReplayControlBarLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ReplayControlBarLogic.cs index be92013d90..964b567903 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ReplayControlBarLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ReplayControlBarLogic.cs @@ -15,7 +15,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ReplayControlBarLogic + public class ReplayControlBarLogic : ChromeLogic { enum PlaybackSpeed { Regular, Slow, Fast, Maximum } diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerBinLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerBinLogic.cs index 1045b65345..8ddcae22d3 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerBinLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerBinLogic.cs @@ -13,7 +13,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class SupportPowerBinLogic + public class SupportPowerBinLogic : ChromeLogic { [ObjectCreator.UseCtor] public SupportPowerBinLogic(Widget widget, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerTooltipLogic.cs index 28de306f92..ad81efdfe2 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerTooltipLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerTooltipLogic.cs @@ -14,7 +14,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class SupportPowerTooltipLogic + public class SupportPowerTooltipLogic : ChromeLogic { [ObjectCreator.UseCtor] public SupportPowerTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer, SupportPowersWidget palette, World world) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/WorldTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/WorldTooltipLogic.cs index e2ce076818..b532cc4fab 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/WorldTooltipLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/WorldTooltipLogic.cs @@ -16,7 +16,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class WorldTooltipLogic + public class WorldTooltipLogic : ChromeLogic { [ObjectCreator.UseCtor] public WorldTooltipLogic(Widget widget, World world, TooltipContainerWidget tooltipContainer, ViewportControllerWidget viewport) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackagesLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackagesLogic.cs index bbeb55bb29..99dacbc8e1 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackagesLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackagesLogic.cs @@ -18,7 +18,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class DownloadPackagesLogic + public class DownloadPackagesLogic : ChromeLogic { static readonly string[] SizeSuffixes = { "bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" }; readonly Widget panel; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromCDLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromCDLogic.cs index 960e4ce140..89a096cf73 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromCDLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromCDLogic.cs @@ -17,7 +17,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class InstallFromCDLogic + public class InstallFromCDLogic : ChromeLogic { readonly string modId; readonly Widget panel; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallLogic.cs index 59591abd72..6f851b8d6b 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallLogic.cs @@ -12,7 +12,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class InstallLogic : Widget + public class InstallLogic : ChromeLogic { [ObjectCreator.UseCtor] public InstallLogic(Widget widget, string mirrorListUrl, string modId) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallMusicLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallMusicLogic.cs index 0b1fa7c794..584924e30d 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallMusicLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallMusicLogic.cs @@ -13,7 +13,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class InstallMusicLogic + public class InstallMusicLogic : ChromeLogic { [ObjectCreator.UseCtor] public InstallMusicLogic(Widget widget, string modId) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/ClientTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/ClientTooltipLogic.cs index ebfe9486b4..c371b210bb 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/ClientTooltipLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/ClientTooltipLogic.cs @@ -15,7 +15,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ClientTooltipLogic + public class ClientTooltipLogic : ChromeLogic { [ObjectCreator.UseCtor] public ClientTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer, OrderManager orderManager, int clientIndex) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/KickClientLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/KickClientLogic.cs index 36a637d056..596e1c4322 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/KickClientLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/KickClientLogic.cs @@ -13,7 +13,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - class KickClientLogic + class KickClientLogic : ChromeLogic { [ObjectCreator.UseCtor] public KickClientLogic(Widget widget, string clientName, Action okPressed, Action cancelPressed) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/KickSpectatorsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/KickSpectatorsLogic.cs index 28a467d928..7343eeee2d 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/KickSpectatorsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/KickSpectatorsLogic.cs @@ -13,7 +13,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - class KickSpectatorsLogic + class KickSpectatorsLogic : ChromeLogic { [ObjectCreator.UseCtor] public KickSpectatorsLogic(Widget widget, string clientCount, Action okPressed, Action cancelPressed) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs index df715396d3..10cdae4c01 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs @@ -21,7 +21,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class LobbyLogic + public class LobbyLogic : ChromeLogic { static readonly Action DoNothing = () => { }; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyMapPreviewLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyMapPreviewLogic.cs index 1fa4bf28de..3ed4034e91 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyMapPreviewLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyMapPreviewLogic.cs @@ -13,7 +13,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class LobbyMapPreviewLogic + public class LobbyMapPreviewLogic : ChromeLogic { [ObjectCreator.UseCtor] internal LobbyMapPreviewLogic(Widget widget, OrderManager orderManager, LobbyLogic lobby) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/SpawnSelectorTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/SpawnSelectorTooltipLogic.cs index 30e6976e47..a2e8a04704 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/SpawnSelectorTooltipLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/SpawnSelectorTooltipLogic.cs @@ -14,7 +14,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class SpawnSelectorTooltipLogic + public class SpawnSelectorTooltipLogic : ChromeLogic { [ObjectCreator.UseCtor] public SpawnSelectorTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer, MapPreviewWidget preview) diff --git a/OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs index c1bf1a866f..4a944cb647 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs @@ -18,7 +18,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class MainMenuLogic + public class MainMenuLogic : ChromeLogic { protected enum MenuType { Main, Singleplayer, Extras, MapEditor, None } diff --git a/OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs index 0a2e3ea3c9..45349bfcd6 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs @@ -18,7 +18,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class MapChooserLogic + public class MapChooserLogic : ChromeLogic { readonly Widget widget; readonly DropDownButtonWidget gameModeDropdown; diff --git a/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs index d2c2a23f06..9f25a5f7de 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs @@ -21,7 +21,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class MissionBrowserLogic + public class MissionBrowserLogic : ChromeLogic { enum PlayingVideo { None, Info, Briefing, GameStart } diff --git a/OpenRA.Mods.Common/Widgets/Logic/ModBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ModBrowserLogic.cs index 80597047e2..d633897aba 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ModBrowserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ModBrowserLogic.cs @@ -19,7 +19,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ModBrowserLogic + public class ModBrowserLogic : ChromeLogic { readonly Widget modList; readonly ButtonWidget modTemplate; diff --git a/OpenRA.Mods.Common/Widgets/Logic/MusicPlayerLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MusicPlayerLogic.cs index d13f2fb49f..b85f0ad82d 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/MusicPlayerLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/MusicPlayerLogic.cs @@ -16,7 +16,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class MusicPlayerLogic + public class MusicPlayerLogic : ChromeLogic { readonly ScrollPanelWidget musicList; readonly ScrollItemWidget itemTemplate; diff --git a/OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs index 9db2bd0932..dad599341d 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs @@ -13,7 +13,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class PerfDebugLogic + public class PerfDebugLogic : ChromeLogic { [ObjectCreator.UseCtor] public PerfDebugLogic(Widget widget) diff --git a/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs index 622c43425d..821b28fc95 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs @@ -22,7 +22,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ReplayBrowserLogic + public class ReplayBrowserLogic : ChromeLogic { static Filter filter = new Filter(); diff --git a/OpenRA.Mods.Common/Widgets/Logic/ServerBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ServerBrowserLogic.cs index e7a53f168f..65a0622778 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ServerBrowserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ServerBrowserLogic.cs @@ -20,7 +20,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ServerBrowserLogic + public class ServerBrowserLogic : ChromeLogic { static readonly Action DoNothing = () => { }; diff --git a/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs index df24a42fb5..bf2891b404 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs @@ -14,7 +14,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class ServerCreationLogic + public class ServerCreationLogic : ChromeLogic { Widget panel; Action onCreate; diff --git a/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs index dbdbf26293..ed1a5fa26a 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs @@ -17,7 +17,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class SettingsLogic + public class SettingsLogic : ChromeLogic { enum PanelType { Display, Audio, Input, Advanced } Dictionary leavePanelActions = new Dictionary(); diff --git a/OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs index a33fc14d41..ededbfa962 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs @@ -13,7 +13,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class SimpleTooltipLogic + public class SimpleTooltipLogic : ChromeLogic { [ObjectCreator.UseCtor] public SimpleTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer, Func getText) diff --git a/OpenRA.Mods.Common/Widgets/Logic/TabCompletionLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/TabCompletionLogic.cs index fcc5b490e3..558f9fd7fa 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/TabCompletionLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/TabCompletionLogic.cs @@ -11,10 +11,11 @@ using System; using System.Collections.Generic; using System.Linq; +using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public class TabCompletionLogic + public class TabCompletionLogic : ChromeLogic { IList candidates = new List(); int currentCandidateIndex = 0;