remove some duplication in LobbyLogic's color picker handling
This commit is contained in:
@@ -299,16 +299,18 @@ namespace OpenRA.Mods.RA.Widgets.Logic
|
|||||||
|
|
||||||
var rangeSlider = colorChooser.GetWidget<SliderWidget>("RANGE_SLIDER");
|
var rangeSlider = colorChooser.GetWidget<SliderWidget>("RANGE_SLIDER");
|
||||||
rangeSlider.Value = orderManager.LocalClient.ColorRamp.R / 255f;
|
rangeSlider.Value = orderManager.LocalClient.ColorRamp.R / 255f;
|
||||||
|
|
||||||
hueSlider.OnChange += _ => UpdateColorPreview(hueSlider.Value, satSlider.Value, lumSlider.Value, rangeSlider.Value);
|
Action updateColorPreview = () => 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);
|
hueSlider.OnChange += _ => updateColorPreview();
|
||||||
rangeSlider.OnChange += _ => UpdateColorPreview(hueSlider.Value, satSlider.Value, lumSlider.Value, rangeSlider.Value);
|
satSlider.OnChange += _ => updateColorPreview();
|
||||||
UpdateColorPreview(hueSlider.Value, satSlider.Value, lumSlider.Value, rangeSlider.Value);
|
lumSlider.OnChange += _ => updateColorPreview();
|
||||||
|
rangeSlider.OnChange += _ => updateColorPreview();
|
||||||
|
updateColorPreview();
|
||||||
|
|
||||||
colorChooser.GetWidget<ButtonWidget>("BUTTON_OK").OnClick = () =>
|
colorChooser.GetWidget<ButtonWidget>("BUTTON_OK").OnClick = () =>
|
||||||
{
|
{
|
||||||
UpdateColorPreview(hueSlider.Value, satSlider.Value, lumSlider.Value, rangeSlider.Value);
|
updateColorPreview();
|
||||||
UpdatePlayerColor(hueSlider.Value, satSlider.Value, lumSlider.Value, rangeSlider.Value);
|
UpdatePlayerColor(hueSlider.Value, satSlider.Value, lumSlider.Value, rangeSlider.Value);
|
||||||
color.RemovePanel();
|
color.RemovePanel();
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user