From 6fd1e65db7212ef7aab84c46e42327f2874bf957 Mon Sep 17 00:00:00 2001
From: BookerLiu <booker_liu@163.com>
Date: Fri, 21 Apr 2023 17:35:18 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=9B=B4=E6=94=B9=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Control/Other/MyColorPickerDialog.xaml.cs | 8 +++++---
 MainWindow.xaml                           | 9 ++++++++-
 ViewModel/Temp/GradientBGParamList.cs     | 2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

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<Color> 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 @@
                         <DockPanel.Background>
                             <SolidColorBrush Opacity="0.01"/>
                         </DockPanel.Background>
-                        <Image Visibility="{Binding AppConfig.TitleLogoVisible}" Source="/Resource/Image/TitleLogo.png" RenderOptions.BitmapScalingMode="HighQuality" Margin="10,0,0,0" Width="200" Height="30" HorizontalAlignment="Left"/>
+                        <Image Visibility="{Binding AppConfig.TitleLogoVisible}" 
+                               Source="/Resource/Image/TitleLogo.png" 
+                               RenderOptions.BitmapScalingMode="HighQuality" 
+                               Margin="10,0,0,0" 
+                               Width="200" 
+                               Height="30" 
+                               Opacity="0.8"
+                               HorizontalAlignment="Left"/>
                     </DockPanel>
 
                     <DockPanel Grid.Row="0" Grid.Column="2" MouseDown="DragMove">
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<GradientBGParam>)ConfigurationManager.GetSection("SystemBGs")
             gradientBGParams = new ObservableCollection<GradientBGParam>
             {
-                new GradientBGParam("魅惑妖术", "#FFDDE1", "#EE9CA7"),
+                new GradientBGParam("魅惑妖术", "#EE9CA7", "#FFDDE1"),
                 new GradientBGParam ("森林之友", "#EBF7E3", "#A8E4C0"),
                 new GradientBGParam("完美谢幕", "#D76D77", "#FFAF7B")
             };