From 8d4afab8ee1be09948d5c0b56120c1579e14bdcd Mon Sep 17 00:00:00 2001 From: Mikhail Temkine Date: Thu, 16 Aug 2018 19:53:13 -0400 Subject: [PATCH] MT - add seedColor parameter to ShowDialog --- src/ColorPickerWPF/ColorPickRow.xaml.cs | 2 +- src/ColorPickerWPF/ColorPickerWindow.xaml.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ColorPickerWPF/ColorPickRow.xaml.cs b/src/ColorPickerWPF/ColorPickRow.xaml.cs index d20c81c..cab09e6 100644 --- a/src/ColorPickerWPF/ColorPickRow.xaml.cs +++ b/src/ColorPickerWPF/ColorPickRow.xaml.cs @@ -25,7 +25,7 @@ public ColorPickRow() private void PickColorButton_OnClick(object sender, RoutedEventArgs e) { Color color; - if (ColorPickerWindow.ShowDialog(out color, Options)) + if (ColorPickerWindow.ShowDialog(out color, seedColor: Color, flags: Options)) { SetColor(color); OnPick?.Invoke(this, EventArgs.Empty); diff --git a/src/ColorPickerWPF/ColorPickerWindow.xaml.cs b/src/ColorPickerWPF/ColorPickerWindow.xaml.cs index f7f4c58..3f6e791 100644 --- a/src/ColorPickerWPF/ColorPickerWindow.xaml.cs +++ b/src/ColorPickerWPF/ColorPickerWindow.xaml.cs @@ -20,7 +20,7 @@ public ColorPickerWindow() InitializeComponent(); } - public static bool ShowDialog(out Color color, ColorPickerDialogOptions flags = ColorPickerDialogOptions.None, ColorPickerControl.ColorPickerChangeHandler customPreviewEventHandler = null) + public static bool ShowDialog(out Color color, Color? seedColor = null, ColorPickerDialogOptions flags = ColorPickerDialogOptions.None, ColorPickerControl.ColorPickerChangeHandler customPreviewEventHandler = null) { if ((flags & ColorPickerDialogOptions.LoadCustomPalette) == ColorPickerDialogOptions.LoadCustomPalette) { @@ -28,6 +28,7 @@ public static bool ShowDialog(out Color color, ColorPickerDialogOptions flags = } var instance = new ColorPickerWindow(); + instance.ColorPicker.SetColor(seedColor ?? Colors.White); color = instance.ColorPicker.Color; if ((flags & ColorPickerDialogOptions.SimpleView) == ColorPickerDialogOptions.SimpleView)