From 9b9f13ed1b9c6c706e5017cfc52b46f9ae284feb Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 29 Jul 2011 18:58:44 +1200 Subject: [PATCH] remove some duplication in LobbyLogic's color picker handling --- OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index a935550403..59c23fe426 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -299,16 +299,18 @@ namespace OpenRA.Mods.RA.Widgets.Logic var rangeSlider = colorChooser.GetWidget("RANGE_SLIDER"); rangeSlider.Value = orderManager.LocalClient.ColorRamp.R / 255f; - - hueSlider.OnChange += _ => UpdateColorPreview(hueSlider.Value, satSlider.Value, lumSlider.Value, rangeSlider.Value); - satSlider.OnChange += _ => UpdateColorPreview(hueSlider.Value, satSlider.Value, lumSlider.Value, rangeSlider.Value); - lumSlider.OnChange += _ => UpdateColorPreview(hueSlider.Value, satSlider.Value, lumSlider.Value, rangeSlider.Value); - rangeSlider.OnChange += _ => UpdateColorPreview(hueSlider.Value, satSlider.Value, lumSlider.Value, rangeSlider.Value); - UpdateColorPreview(hueSlider.Value, satSlider.Value, lumSlider.Value, rangeSlider.Value); + + Action updateColorPreview = () => UpdateColorPreview(hueSlider.Value, satSlider.Value, lumSlider.Value, rangeSlider.Value); + + hueSlider.OnChange += _ => updateColorPreview(); + satSlider.OnChange += _ => updateColorPreview(); + lumSlider.OnChange += _ => updateColorPreview(); + rangeSlider.OnChange += _ => updateColorPreview(); + updateColorPreview(); colorChooser.GetWidget("BUTTON_OK").OnClick = () => { - UpdateColorPreview(hueSlider.Value, satSlider.Value, lumSlider.Value, rangeSlider.Value); + updateColorPreview(); UpdatePlayerColor(hueSlider.Value, satSlider.Value, lumSlider.Value, rangeSlider.Value); color.RemovePanel(); };