Merge pull request #10624 from pchote/overhaul-color-validator

Fix color validator issues and increase color picker palette size.
2016-01-29 23:57:46 +01:00
parent 42711dbe7b dd963b75f5
commit c19383472f
27 changed files with 387 additions and 330 deletions
--- a/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
@@ -56,7 +56,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				};

 			// Set the initial state
+			var validator = Game.ModData.Manifest.Get<ColorValidator>();
+			mixer.SetPaletteRange(validator.HsvSaturationRange[0], validator.HsvSaturationRange[1], validator.HsvValueRange[0], validator.HsvValueRange[1]);
 			mixer.Set(initialColor);
+
 			hueSlider.Value = initialColor.H / 255f;
 			onChange(mixer.Color);
 		}