From f56991410b516365fb3f6b16524e55447264d1e1 Mon Sep 17 00:00:00 2001
From: liufei <demoliu94@163.com>
Date: Fri, 27 May 2022 11:19:54 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95=E5=90=8D=E7=A7=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Control/UserControls/PannelCard/LeftCardControl.xaml.cs | 7 +++++--
 MainWindow.xaml                                         | 2 +-
 MainWindow.xaml.cs                                      | 7 ++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Control/UserControls/PannelCard/LeftCardControl.xaml.cs b/Control/UserControls/PannelCard/LeftCardControl.xaml.cs
index 53fa4ba..09e5793 100644
--- a/Control/UserControls/PannelCard/LeftCardControl.xaml.cs
+++ b/Control/UserControls/PannelCard/LeftCardControl.xaml.cs
@@ -25,7 +25,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
 
 
         //是否正在修改菜单
-        private static bool IS_EDIT = false;
+        public bool IS_EDIT = false;
 
         public LeftCardControl()
         {
@@ -205,9 +205,9 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void RenameMenu(object sender, RoutedEventArgs e)
         {
+            IS_EDIT = true;
             MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo;
             menuInfo.MenuEdit = (int)Visibility.Visible;
-            IS_EDIT = true;
         }
 
         /// <summary>
@@ -276,6 +276,8 @@ namespace GeekDesk.Control.UserControls.PannelCard
                     menuInfo.MenuEdit = Visibility.Collapsed;
                 }
                 IS_EDIT = false;
+                //为了解决无法修改菜单的问题
+                MainWindow.mainWindow.SearchBox.Focus();
                 MenuListBox.SelectedIndex = menuSelectIndexTemp;
             }
         }
@@ -309,6 +311,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
 
         private void Menu_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
+            if (IS_EDIT) return;
             //设置对应菜单的图标列表
             if (MenuListBox.SelectedIndex == -1)
             {
diff --git a/MainWindow.xaml b/MainWindow.xaml
index ba1da4e..1f8733d 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -125,7 +125,7 @@
                     </DockPanel>
 
 
-                    <uc:LeftCardControl Grid.Row="1" Grid.Column="0"/>
+                    <uc:LeftCardControl x:Name="LeftCard" Grid.Row="1" Grid.Column="0"/>
 
                     <!--分割线-->
                     <GridSplitter Opacity="0" Grid.Row="1" Grid.Column="0" Width="1"  VerticalAlignment="Stretch" HorizontalAlignment="Right"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index f4cd8b4..fa95683 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -1,5 +1,6 @@
 using GeekDesk.Constant;
 using GeekDesk.Control.UserControls.Config;
+using GeekDesk.Control.UserControls.PannelCard;
 using GeekDesk.Control.Windows;
 using GeekDesk.Interface;
 using GeekDesk.MyThread;
@@ -725,7 +726,11 @@ namespace GeekDesk
 
         private void Window_GotFocus(object sender, RoutedEventArgs e)
         {
-            Keyboard.Focus(SearchBox);
+            if (!LeftCard.IS_EDIT)
+            {
+                //if判断是为了能够使修改菜单时  菜单能够获得焦点
+                Keyboard.Focus(SearchBox);
+            }
         }
 
         private void AppWindow_Deactivated(object sender, EventArgs e)