From 80a997514025d4f195dd1a20ee96a06f6c2d82a5 Mon Sep 17 00:00:00 2001
From: BookerLiu <booker_liu@163.com>
Date: Mon, 20 Mar 2023 14:19:56 +0800
Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20=E5=8D=87=E7=BA=A7=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Control/UserControls/Config/OtherControl.xaml | 22 ++++++++++++-------
 Control/UserControls/Config/ThemeControl.xaml |  4 +++-
 .../PannelCard/RightCardControl.xaml          |  3 +--
 GeekDesk.csproj                               |  4 ++--
 Util/CommonCode.cs                            |  6 +++++
 packages.config                               |  2 +-
 6 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/Control/UserControls/Config/OtherControl.xaml b/Control/UserControls/Config/OtherControl.xaml
index 4ddb204..6de912c 100644
--- a/Control/UserControls/Config/OtherControl.xaml
+++ b/Control/UserControls/Config/OtherControl.xaml
@@ -29,11 +29,13 @@
                     </CheckBox>
                 </hc:UniformSpacingPanel>
                 <hc:UniformSpacingPanel Spacing="10" Margin="20,6,0,0">
-                    <CheckBox  Content="性能模式" IsChecked="{Binding PMModel}" 
-                           hc:Poptip.HitMode="None" 
-                           hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                           hc:Poptip.Content="开启性能模式将取消图标动画效果" 
-                           hc:Poptip.Placement="TopLeft">
+                    <CheckBox Content="性能模式" IsChecked="{Binding PMModel}" 
+                              hc:Poptip.HitMode="None" 
+                              hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
+                              hc:Poptip.Content="开启性能模式将取消图标动画效果" 
+                              hc:Poptip.Placement="LeftTop"
+                              hc:Poptip.VerticalOffset="-35"
+                              hc:Poptip.HorizontalOffset="-15">
                         <CheckBox.Background>
                             <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                                 <GradientStop Color="#FF9EA3A6"/>
@@ -47,7 +49,9 @@
                            hc:Poptip.HitMode="None"
                            hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
                            hc:Poptip.Content="仅Win11有效" 
-                           hc:Poptip.Placement="TopLeft">
+                           hc:Poptip.Placement="LeftTop"
+                              hc:Poptip.VerticalOffset="-35"
+                              hc:Poptip.HorizontalOffset="-1">
                         <CheckBox.Background>
                             <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                                 <GradientStop Color="#FF9EA3A6"/>
@@ -112,8 +116,10 @@
                 <hc:UniformSpacingPanel Spacing="10" Margin="20,8,0,0">
                     <Button Content="备份数据" 
                             hc:Poptip.Content="当数据文件损坏时, 以便能够恢复部分数据 (损坏时将有操作提示)"
-                            hc:Poptip.Placement="TopLeft"
-                            hc:Poptip.Offset="10"
+                            hc:Poptip.Placement="LeftTop"
+                            hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
+                              hc:Poptip.VerticalOffset="-35"
+                              hc:Poptip.HorizontalOffset="-15"
                             Style="{StaticResource Btn1}" 
                             Click="BakDataFile"/>
                 </hc:UniformSpacingPanel>
diff --git a/Control/UserControls/Config/ThemeControl.xaml b/Control/UserControls/Config/ThemeControl.xaml
index 0159ffc..6b5ba21 100644
--- a/Control/UserControls/Config/ThemeControl.xaml
+++ b/Control/UserControls/Config/ThemeControl.xaml
@@ -100,7 +100,9 @@
                                     hc:Poptip.HitMode="None" 
                                     hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
                                     hc:Poptip.Content="{Binding GradientBGParam.Name, Converter={StaticResource StringAppendConvert}, ConverterParameter=当前设置: \{\}}" 
-                                    hc:Poptip.Placement="Top"
+                                    hc:Poptip.Placement="LeftTop"
+                                    hc:Poptip.VerticalOffset="-35"
+                                    hc:Poptip.HorizontalOffset="-15"
                                     Click="SysBG_Click"
                                     />
                         </StackPanel>
diff --git a/Control/UserControls/PannelCard/RightCardControl.xaml b/Control/UserControls/PannelCard/RightCardControl.xaml
index 480bd9f..056bee2 100644
--- a/Control/UserControls/PannelCard/RightCardControl.xaml
+++ b/Control/UserControls/PannelCard/RightCardControl.xaml
@@ -170,7 +170,6 @@
                                 <ListBox.Template>
                                     <ControlTemplate TargetType="ListBox">
                                         <hc:ScrollViewer x:Name="WrapScroll"
-                                                         Orientation="Vertical" 
                                                          HorizontalScrollBarVisibility="Hidden" 
                                                          VerticalScrollBarVisibility="Auto" 
                                                          IsInertiaEnabled="True"
@@ -296,7 +295,7 @@
                                      >
                             <ListBox.Template>
                                 <ControlTemplate TargetType="ListBox">
-                                    <hc:ScrollViewer Orientation="Vertical" 
+                                    <hc:ScrollViewer  
                                                      HorizontalScrollBarVisibility="Hidden" 
                                                      VerticalScrollBarVisibility="Auto" 
                                                      IsInertiaEnabled="True"
diff --git a/GeekDesk.csproj b/GeekDesk.csproj
index bb2cde1..2384338 100644
--- a/GeekDesk.csproj
+++ b/GeekDesk.csproj
@@ -85,8 +85,8 @@
     <Reference Include="Gma.System.MouseKeyHook, Version=5.6.130.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\MouseKeyHook.5.6.0\lib\net40\Gma.System.MouseKeyHook.dll</HintPath>
     </Reference>
-    <Reference Include="HandyControl, Version=3.3.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL">
-      <HintPath>packages\HandyControl.3.3.0\lib\net472\HandyControl.dll</HintPath>
+    <Reference Include="HandyControl, Version=3.4.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL">
+      <HintPath>packages\HandyControl.3.4.0\lib\net472\HandyControl.dll</HintPath>
     </Reference>
     <Reference Include="KeyMouseHook, Version=1.0.6.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\KeyMouseHook.1.0.6\lib\net40\KeyMouseHook.dll</HintPath>
diff --git a/Util/CommonCode.cs b/Util/CommonCode.cs
index c39d449..6985d3f 100644
--- a/Util/CommonCode.cs
+++ b/Util/CommonCode.cs
@@ -43,6 +43,12 @@ namespace GeekDesk.Util
                     {
                         BinaryFormatter bf = new BinaryFormatter();
                         appData = bf.Deserialize(fs) as AppData;
+
+                        //将菜单密码写入文件
+                        if (!string.IsNullOrEmpty(appData.AppConfig.MenuPassword))
+                        {
+                            SavePassword(appData.AppConfig.MenuPassword);
+                        }
                     }
                 }
                 catch
diff --git a/packages.config b/packages.config
index f7b62a9..7d79221 100644
--- a/packages.config
+++ b/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="2.0.6" targetFramework="net452" requireReinstallation="true" />
-  <package id="HandyControl" version="3.3.0" targetFramework="net472" />
+  <package id="HandyControl" version="3.4.0" targetFramework="net472" />
   <package id="KeyMouseHook" version="1.0.6" targetFramework="net472" developmentDependency="true" />
   <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="net472" developmentDependency="true" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net472" />