From 14f2ae481a0ef029640381e97f33472ebcdce7a4 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 15 Aug 2019 10:34:31 -0500 Subject: [PATCH] selection highlight and background color picker popupsnow make use of the new alpha hotness --- .../Controls/DIYGrid/Settings/SimpleGridSettingsVM.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsVM.cs b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsVM.cs index 0ff2b120c..9bb6232ca 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsVM.cs +++ b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsVM.cs @@ -80,8 +80,8 @@ namespace mbts.spark { public FontFamily font_family { get => _font_family.Value; set => _font_family.set(value); } public FontWeight font_weight { get => _font_weight.Value; set => _font_weight.set(value); } public ColorPickerPopupVM font_color { get; } = new ColorPickerPopupVM(); - public ColorPickerPopupVM selection_highlight { get; } = new ColorPickerPopupVM(); - public ColorPickerPopupVM background_color { get; } = new ColorPickerPopupVM(); + public ColorPickerPopupVM selection_highlight { get; } = new ColorPickerPopupVM(){ bind_opacity_to_alpha = true }; + public ColorPickerPopupVM background_color { get; } = new ColorPickerPopupVM() { bind_opacity_to_alpha = true }; public bool show_background_color => _show_background_color.Value; public double font_size { get => _font_size.Value; set => _font_size.set(value); } public bool enable_sound_triggers => false; @@ -118,10 +118,10 @@ namespace mbts.spark { _font_family.set(new FontFamily(value.font_family)); _font_weight.set(value.font_weight); font_color.load_from(value.font_color.rgb_solid_brush()); - selection_highlight.load_from(value.selection_highlight.to_brush()); + selection_highlight.color = value.selection_highlight.argb_color; _show_background_color.set(value.enable_background_color); if (value.enable_background_color) { - background_color.load_from(value.background_color.argb_color().to_solid_brush()); + background_color.color = value.background_color.argb_color(); } _font_size.set(value.font_size); var curr_col_id = current_column?.id;