diff --git a/Control/Other/MyColorPickerDialog.xaml.cs b/Control/Other/MyColorPickerDialog.xaml.cs index f1075b2..9fb4839 100644 --- a/Control/Other/MyColorPickerDialog.xaml.cs +++ b/Control/Other/MyColorPickerDialog.xaml.cs @@ -1,4 +1,5 @@ using GeekDesk.Control.Windows; +using GeekDesk.Util; using GeekDesk.ViewModel; using System; using System.Reflection; @@ -64,14 +65,15 @@ namespace GeekDesk.Control.Other private void MyColorPicker_SelectedColorChanged(object sender, HandyControl.Data.FunctionEventArgs e) { SolidColorBrush scb = MyColorPicker.SelectedBrush; + Color c = scb.Color; switch (colorType) { case ColorType.COLOR_1: - appConfig.GradientBGParam.Color1 = scb.ToString(); break; + appConfig.GradientBGParam.Color1 = string.Format("#{0:X2}{1:X2}{2:X2}", c.R, c.G, c.B); break; case ColorType.COLOR_2: - appConfig.GradientBGParam.Color2 = scb.ToString(); break; + appConfig.GradientBGParam.Color2 = string.Format("#{0:X2}{1:X2}{2:X2}", c.R, c.G, c.B); break; default: - appConfig.TextColor = scb.ToString(); break; + appConfig.TextColor = string.Format("#{0:X2}{1:X2}{2:X2}", c.R, c.G, c.B); break; } } diff --git a/MainWindow.xaml b/MainWindow.xaml index 27fd6f9..36a6b00 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -181,7 +181,14 @@ - + diff --git a/ViewModel/Temp/GradientBGParamList.cs b/ViewModel/Temp/GradientBGParamList.cs index 00d81fb..6a6fa7d 100644 --- a/ViewModel/Temp/GradientBGParamList.cs +++ b/ViewModel/Temp/GradientBGParamList.cs @@ -13,7 +13,7 @@ namespace GeekDesk.ViewModel.Temp //gradientBGParams = (ObservableCollection)ConfigurationManager.GetSection("SystemBGs") gradientBGParams = new ObservableCollection { - new GradientBGParam("魅惑妖术", "#FFDDE1", "#EE9CA7"), + new GradientBGParam("魅惑妖术", "#EE9CA7", "#FFDDE1"), new GradientBGParam ("森林之友", "#EBF7E3", "#A8E4C0"), new GradientBGParam("完美谢幕", "#D76D77", "#FFAF7B") };