From 18bdeea7651bf8bdf825b09c8bcff4aa0d24b3f4 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 12 Oct 2019 23:12:42 -0500 Subject: [PATCH] add SystemColors palette to color picker gui --- .../Controls/ColorPicker/Code/ColorPalette.cs | 12 ++++++++- .../Controls/ColorPicker/Code/ColorUtils.cs | 27 ++++++++++++++----- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/client/spark/view/Controls/ColorPicker/Code/ColorPalette.cs b/src/client/spark/view/Controls/ColorPicker/Code/ColorPalette.cs index da74d755e..f81ec83f7 100644 --- a/src/client/spark/view/Controls/ColorPicker/Code/ColorPalette.cs +++ b/src/client/spark/view/Controls/ColorPicker/Code/ColorPalette.cs @@ -1,4 +1,5 @@ -using mbts.spark; +using bts.collections; +using mbts.spark; using mbts.spark.utilities; using ProtoBuf; using System.Collections.Generic; @@ -23,6 +24,7 @@ namespace mbts.ui.controls.color_picker { yield return factory_order_colors_palette(order_factory); yield return application_palette(); yield return bts_palette(); + yield return system_palette(); yield return blank_palette(); } @@ -109,6 +111,14 @@ namespace mbts.ui.controls.color_picker { } }; + public static ColorPalette system_palette() => + new ColorPalette { + group = "System", + colors = ColorUtils.SystemColors.WrapReadOnlySelector( + nc => new NamedColor(nc.value, nc.name)) + .ToList() + }; + public static ColorPalette blank_palette() => new ColorPalette { group = "Custom", diff --git a/src/client/spark/view/Controls/ColorPicker/Code/ColorUtils.cs b/src/client/spark/view/Controls/ColorPicker/Code/ColorUtils.cs index 28a98498d..1022fec6a 100644 --- a/src/client/spark/view/Controls/ColorPicker/Code/ColorUtils.cs +++ b/src/client/spark/view/Controls/ColorPicker/Code/ColorUtils.cs @@ -19,6 +19,7 @@ namespace mbts.ui.controls.color_picker { }.to_comparer(); static readonly Named[] + _system_colors, // 'pure' means no grays _pure_web_colors, _gray_web_colors, @@ -32,15 +33,21 @@ namespace mbts.ui.controls.color_picker { _all_web_colors_grid; static ColorUtils() { + var named_color_lh_comp = LHComparer.wrap>(nc => nc.value); + _system_colors = Array.ConvertAll( + typeof(Colors).GetProperties(BindingFlags.Static | BindingFlags.Public), + p => new Named( + DisplayNameHelper.camel_to_title_case(p.Name), + (Color)p.GetValue(null))); + Array.Sort(_system_colors, named_color_lh_comp); _all_web_colors = Array.ConvertAll( - typeof(System.Drawing.Color).GetProperties(BindingFlags.Public | BindingFlags.Static), - p => { + typeof(System.Drawing.Color) + .GetProperties(BindingFlags.Public | BindingFlags.Static), + p => { var c = System.Drawing.Color.FromName(p.Name); - return new Named( - DisplayNameHelper.camel_to_title_case(p.Name), - Color.FromArgb(c.A, c.R, c.G, c.B)); + return new Named(p.Name, Color.FromArgb(c.A, c.R, c.G, c.B)); }); - Array.Sort(_all_web_colors, LHComparer.wrap>(n => n.value)); + Array.Sort(_all_web_colors, named_color_lh_comp); var all_web_colors_grid = new Named[_all_web_colors.Length - 1]; int adj = 0; for (int i = 0; i < _all_web_colors.Length; i++) { @@ -74,6 +81,12 @@ namespace mbts.ui.controls.color_picker { _pure_web_colors_grid = pure_web_colors_grid; } + public static IReadOnlyList> SystemColors => + _system_colors; + + public static IReadOnlyList SystemColorVMs => + _system_colors.WrapSelectorRO(_mk_readonly_vm); + public static IReadOnlyList> WebColors => _all_web_colors; @@ -280,4 +293,4 @@ namespace mbts.ui.controls.color_picker { static NamedColorVM _mk_readonly_vm(Named nc) => new NamedColorVM(new NamedColor(nc.value, nc.name), false); } -} +} \ No newline at end of file