From b097001e6c25337b8fe7eaa3d1052567aa4a23ac Mon Sep 17 00:00:00 2001
From: liufei <demoliu94@163.com>
Date: Wed, 15 Sep 2021 10:12:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.config                                    |  2 +-
 Control/UserControls/Config/AboutControl.xaml |  4 +--
 Control/Windows/ConfigWindow.xaml             | 32 +++++++++++--------
 Control/Windows/ConfigWindow.xaml.cs          | 13 ++++++++
 Properties/AssemblyInfo.cs                    |  4 +--
 Update.json                                   |  6 ++--
 6 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/App.config b/App.config
index 42aa0ad..544efdc 100644
--- a/App.config
+++ b/App.config
@@ -28,7 +28,7 @@
     </assemblyBinding>
   </runtime>
   <appSettings>
-    <add key="Version" value="2.3.11" />
+    <add key="Version" value="2.3.20" />
     <add key="GitHubUrl" value="https://github.com/Demo-Liu/GeekDesk" />
     <add key="GiteeUrl" value="https://gitee.com/demo_liu/GeekDesk/tree/master" />
     <add key="GitHubUpdateUrl" value="https://demo-liu.github.io/GeekDesk/Update.json" />
diff --git a/Control/UserControls/Config/AboutControl.xaml b/Control/UserControls/Config/AboutControl.xaml
index 2c1ea8b..d1bfdb5 100644
--- a/Control/UserControls/Config/AboutControl.xaml
+++ b/Control/UserControls/Config/AboutControl.xaml
@@ -7,13 +7,13 @@
              xmlns:local="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              mc:Ignorable="d" 
-             Background="AliceBlue"
+             Background="Transparent"
              d:DesignHeight="400" d:DesignWidth="500">
 
     <UserControl.Resources>
         <cvt:UpdateTypeConvert x:Key="UpdateTypeConvert"/>
     </UserControl.Resources>
-    <Grid MouseDown="DragMove" Background="AliceBlue">
+    <Grid MouseDown="DragMove">
         <hc:SimplePanel Margin="20,50,20,20" >
             <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Top">
                 <Image Source="/Resource/Image/About.png" Width="400" Height="100"/>
diff --git a/Control/Windows/ConfigWindow.xaml b/Control/Windows/ConfigWindow.xaml
index 8aab8ad..a43a955 100644
--- a/Control/Windows/ConfigWindow.xaml
+++ b/Control/Windows/ConfigWindow.xaml
@@ -18,23 +18,27 @@
     <Window.Resources>
         <Style x:Key="MenuStyle" TargetType="hc:SideMenuItem" BasedOn="{StaticResource SideMenuItemBaseStyle}">
             <Style.Setters>
-                <Setter Property="Background" Value="AliceBlue"/>
+                <Setter Property="Background" Value="Transparent"/>
             </Style.Setters>
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="#FFE2E2E2"/>
+                    <Setter Property="Background" Value="Transparent"/>
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#FFDAD7D7"/>
+                    <Setter Property="Background" Value="Transparent"/>
                 </Trigger>
             </Style.Triggers>
         </Style>
     </Window.Resources>
-     <Border CornerRadius="8" BorderThickness="0">
+    <Border CornerRadius="8" BorderThickness="0">
         <Border.Background>
-            <SolidColorBrush Color="AliceBlue" Opacity="0.9"/>
+            <!--<SolidColorBrush Color="AliceBlue" Opacity="0.9"/>-->
+            <LinearGradientBrush>
+                <GradientStop Color="#009A98" Offset="0"/>
+                <GradientStop Color="#00CA68" Offset="1"/>
+            </LinearGradientBrush>
         </Border.Background>
-        <Grid>
+        <Grid Background="Transparent" MouseDown="DragMove">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
@@ -43,14 +47,13 @@
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
 
-            <hc:Card Grid.Row="0" Grid.Column="0">
-                <hc:SideMenu BorderThickness="1" 
+            <hc:Card Grid.Row="0" Grid.Column="0" Background="Transparent" BorderThickness="0">
+                <hc:SideMenu BorderThickness="0" 
                              AutoSelect="True" 
                              >
                     <hc:SideMenu.Background>
-                        <SolidColorBrush Color="AliceBlue"/>
+                        <SolidColorBrush Color="#00FFFFFF"/>
                     </hc:SideMenu.Background>
-
                     <hc:SideMenu.ItemContainerStyle>
                         <Style TargetType="hc:SideMenuItem" BasedOn="{StaticResource MenuStyle}"/>
                     </hc:SideMenu.ItemContainerStyle>
@@ -63,7 +66,7 @@
                         <hc:SideMenuItem.Icon>
                             <Button Background="Transparent" 
                                     IsEnabled="False"
-                                    Opacity="1"
+                                    Opacity="0.9"
                                     BorderThickness="0"
                                     hc:IconElement.Geometry="{StaticResource About}" 
                                     hc:IconElement.Height="18"
@@ -120,8 +123,11 @@
                     </hc:SideMenuItem>
                 </hc:SideMenu>
             </hc:Card>
-            <hc:ScrollViewer  Grid.Row="0" Grid.Column="1">
-                <hc:Card x:Name="RightCard" Height="480">
+            <hc:ScrollViewer  Grid.Row="0" Grid.Column="1" BorderThickness="0">
+                <hc:Card x:Name="RightCard" Height="480" BorderThickness="0">
+                    <hc:Card.Background>
+                        <SolidColorBrush  Opacity="0"/>
+                    </hc:Card.Background>
                 </hc:Card>
             </hc:ScrollViewer>
 
diff --git a/Control/Windows/ConfigWindow.xaml.cs b/Control/Windows/ConfigWindow.xaml.cs
index 020c5bf..c12b031 100644
--- a/Control/Windows/ConfigWindow.xaml.cs
+++ b/Control/Windows/ConfigWindow.xaml.cs
@@ -63,6 +63,19 @@ namespace GeekDesk.Control.Windows
             }
         }
 
+        /// <summary>
+        /// 移动窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void DragMove(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                this.DragMove();
+            }
+        }
+
         private static System.Windows.Window window = null;
         public static void Show(AppConfig appConfig, MainWindow mainWindow)
         {
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 017bf94..cfc6787 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.1.1")]
-[assembly: AssemblyFileVersion("2.3.1.1")]
+[assembly: AssemblyVersion("2.3.2.0")]
+[assembly: AssemblyFileVersion("2.3.2.0")]
diff --git a/Update.json b/Update.json
index 97c2204..28905fb 100644
--- a/Update.json
+++ b/Update.json
@@ -1,9 +1,9 @@
 {
 	"title": "�汾����",
-	"subTitle": "V2.3.11 ��ʽ��",
+	"subTitle": "V2.3.20 ��ʽ��",
 	"msgTitle": "�������������",
-	"msg": "['2.3.10�汾�и�Сbug,���Խ����Ÿ�����2.3.11��������˼��dei�ǣ����ϲ���Ļ�ȥ���ҵ��Star��(*^__^*)','�޸�����ʾ���ú�,�������ؿ��ٵ�����','�޸��޷�ɾ����ʷ���������BUG','���Ӷ�ʱ�ڴ����,���ڿ�ռ�ø�С���ڴ�','�޸�����ʱ������������ڵ㴰�ڵ�BUG','�����Զ���ͼ���С','���������ʹ��CRON����ʽ�Զ�������Ƶ��']",
+	"msg": "['']",
 	"githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases/tag",
 	"giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases",
-	"version": "2.3.11"
+	"version": "2.3.20"
 }
\ No newline at end of file