From 9dd0ad980ba9c071cb76a1f091729b759b3ae3b8 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sun, 17 Jul 2011 12:43:12 +1200 Subject: [PATCH] remove backwards compatibility crap from RA edgescroll config --- OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs index 6429b503fc..997998d17e 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs @@ -50,14 +50,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic edgescrollCheckbox.IsChecked = () => Game.Settings.Game.ViewportEdgeScroll; edgescrollCheckbox.OnClick = () => Game.Settings.Game.ViewportEdgeScroll ^= true; - // Added scroll sensitivity - Gecko var edgeScrollSlider = general.GetWidget("EDGE_SCROLL_AMOUNT"); - if (edgeScrollSlider != null) // Backwards compatible - Gecko - { - edgeScrollSlider.SetOffset(Game.Settings.Game.ViewportEdgeScrollStep); - edgeScrollSlider.OnChange += _ => { Game.Settings.Game.ViewportEdgeScrollStep = edgeScrollSlider.GetOffset(); }; - Game.Settings.Game.ViewportEdgeScrollStep = edgeScrollSlider.GetOffset(); - } + edgeScrollSlider.SetOffset(Game.Settings.Game.ViewportEdgeScrollStep); + edgeScrollSlider.OnChange += _ => { Game.Settings.Game.ViewportEdgeScrollStep = edgeScrollSlider.GetOffset(); }; + Game.Settings.Game.ViewportEdgeScrollStep = edgeScrollSlider.GetOffset(); var inversescroll = general.GetWidget("INVERSE_SCROLL"); inversescroll.IsChecked = () => Game.Settings.Game.MouseScroll == MouseScrollType.Inverted; @@ -80,7 +76,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic musicslider.GetOffset = () => Sound.MusicVolume; musicslider.SetOffset(Sound.MusicVolume); - // Display var display = bg.GetWidget("DISPLAY_PANE"); var gs = Game.Settings.Graphics; @@ -125,7 +120,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic // Debug var debug = bg.GetWidget("DEBUG_PANE"); - var perfgraphCheckbox = debug.GetWidget("PERFDEBUG_CHECKBOX"); perfgraphCheckbox.IsChecked = () => Game.Settings.Debug.PerfGraph;