From 0d85a7840a3dd736046ee525a1b14647db86fcff Mon Sep 17 00:00:00 2001
From: "DESKTOP-GPE37UV\\THINKAPD" <tw919@qq.com>
Date: Tue, 4 Apr 2023 10:13:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3PanelLocker=E5=92=8CPanelLock?=
 =?UTF-8?q?erPasswordChanger=E6=8E=A7=E4=BB=B6=E6=98=BE=E7=A4=BA=E5=90=8E?=
 =?UTF-8?q?=E7=84=A6=E7=82=B9=E6=B2=A1=E6=9C=89=E8=87=AA=E5=8A=A8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=9C=A8=E5=AF=86=E7=A0=81=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UIClient/Ctrlib/Controls/PanelLocker.xaml  |  1 -
 .../Ctrlib/Controls/PanelLocker.xaml.cs        | 18 +++++++++++++++---
 .../Controls/PanelLockerPasswordChanger.xaml   |  2 +-
 .../PanelLockerPasswordChanger.xaml.cs         |  5 +++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLocker.xaml b/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLocker.xaml
index beb20e5..6dc64e6 100644
--- a/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLocker.xaml
+++ b/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLocker.xaml
@@ -24,7 +24,6 @@
                     HorizontalContentAlignment="Center"
                     VerticalContentAlignment="Center"
                     MaxLength="15" Grid.Row="1"
-                    FocusManager.FocusedElement="{Binding RelativeSource={RelativeSource Self}}"
                     PreviewKeyDown="TxtPass_OnPreviewKeyDown"/>
                 <TextBlock x:Name="txtInfo" Grid.Row="2" Grid.ColumnSpan="3" FontSize="9" HorizontalAlignment="Center" Margin="0,5,0,0" FontStyle="Italic" Foreground="Red"/>
                 <Button 
diff --git a/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLocker.xaml.cs b/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLocker.xaml.cs
index 36d32e1..b3e392a 100644
--- a/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLocker.xaml.cs
+++ b/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLocker.xaml.cs
@@ -66,6 +66,19 @@ namespace MECF.Framework.UI.Client.Ctrlib.Controls
                 Dispatcher.Invoke(Lock);
                 return true;
             }, "AutoLockRecipeEditor");
+
+            Loaded += (sender, args) =>
+            {
+                txtPass.Focus();
+            };
+
+            IsVisibleChanged += (sender, args) =>
+            {
+                if (args.NewValue is bool isVis && isVis)
+                {
+                    txtPass.Focus();
+                }
+            };
         }
 
         #region Dps
@@ -132,6 +145,8 @@ namespace MECF.Framework.UI.Client.Ctrlib.Controls
 
         #region Methods
 
+        
+
         public void Lock()
         {
             txtPass.Password = "";
@@ -263,8 +278,5 @@ namespace MECF.Framework.UI.Client.Ctrlib.Controls
         }
 
         #endregion
-
-
-      
     }
 }
\ No newline at end of file
diff --git a/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLockerPasswordChanger.xaml b/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLockerPasswordChanger.xaml
index 76802f8..38ae6fe 100644
--- a/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLockerPasswordChanger.xaml
+++ b/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLockerPasswordChanger.xaml
@@ -39,7 +39,7 @@
         <TextBlock Grid.Row="1" Text="New Password"/>
         <TextBlock Grid.Row="2" Text="Confirm Password"/>
 
-        <PasswordBox x:Name="txtOldPass" Grid.Row="0" Grid.Column="1" FocusManager.FocusedElement="{Binding RelativeSource={RelativeSource Self}}"/>
+        <PasswordBox x:Name="txtOldPass" Grid.Row="0" Grid.Column="1" />
         <PasswordBox x:Name="txtNewPass" Grid.Row="1" Grid.Column="1" />
         <PasswordBox x:Name="txtConfirmPass" Grid.Row="2" Grid.Column="1" />
 
diff --git a/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLockerPasswordChanger.xaml.cs b/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLockerPasswordChanger.xaml.cs
index c367e9e..e86ebce 100644
--- a/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLockerPasswordChanger.xaml.cs
+++ b/FrameworkLocal/UIClient/Ctrlib/Controls/PanelLockerPasswordChanger.xaml.cs
@@ -23,6 +23,11 @@ namespace MECF.Framework.UI.Client.Ctrlib.Controls
         public PanelLockerPasswordChanger()
         {
             InitializeComponent();
+
+            Loaded += (sender, args) =>
+            {
+                txtOldPass.Focus();
+            };
         }
 
         private void btnOk_Click(object sender, RoutedEventArgs e)