From 6a78eec5129b0139a2004e62fc1635d22a894e82 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 24 Sep 2011 20:44:38 +1200 Subject: [PATCH] remove duplicated ShowWindowModeDropdown function from CncSettingsLogic --- .../Widgets/Logic/CncSettingsLogic.cs | 25 ++----------------- .../Widgets/Logic/SettingsMenuLogic.cs | 2 +- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs index 47b3aa0ba3..eb65080454 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs @@ -14,6 +14,7 @@ using System.Linq; using OpenRA.FileFormats; using OpenRA.FileFormats.Graphics; using OpenRA.GameRules; +using OpenRA.Mods.RA.Widgets.Logic; using OpenRA.Widgets; namespace OpenRA.Mods.Cnc.Widgets.Logic @@ -74,7 +75,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic // Video var windowModeDropdown = generalPane.GetWidget("MODE_DROPDOWN"); - windowModeDropdown.OnMouseDown = _ => ShowWindowModeDropdown(windowModeDropdown, graphicsSettings); + windowModeDropdown.OnMouseDown = _ => SettingsMenuLogic.ShowWindowModeDropdown(windowModeDropdown, graphicsSettings); windowModeDropdown.GetText = () => graphicsSettings.Mode == WindowMode.Windowed ? "Windowed" : graphicsSettings.Mode == WindowMode.Fullscreen ? "Fullscreen" : "Pseudo-Fullscreen"; @@ -161,28 +162,6 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic return true; } - bool ShowWindowModeDropdown(DropDownButtonWidget dropdown, GraphicSettings s) - { - var options = new Dictionary() - { - { "Pseudo-Fullscreen", WindowMode.PseudoFullscreen }, - { "Fullscreen", WindowMode.Fullscreen }, - { "Windowed", WindowMode.Windowed }, - }; - - Func setupItem = (o, itemTemplate) => - { - var item = ScrollItemWidget.Setup(itemTemplate, - () => s.Mode == options[o], - () => s.Mode = options[o]); - item.GetWidget("LABEL").GetText = () => o; - return item; - }; - - dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 500, options.Keys.ToList(), setupItem); - return true; - } - bool ShowMouseScrollDropdown(DropDownButtonWidget dropdown, GameSettings s) { var options = new Dictionary() diff --git a/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs index a283023c32..8e4d350d5b 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs @@ -133,7 +133,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic return true; } - bool ShowWindowModeDropdown(DropDownButtonWidget dropdown, GraphicSettings s) + public static bool ShowWindowModeDropdown(DropDownButtonWidget dropdown, GraphicSettings s) { var options = new Dictionary() {