From 32adce18158afe8e9ee122678e370b0c27c6c55c Mon Sep 17 00:00:00 2001 From: BookerLiu Date: Mon, 20 Mar 2023 14:38:36 +0800 Subject: [PATCH] =?UTF-8?q?:busts=5Fin=5Fsilhouette:=20=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A2=9E=E5=8A=A0=E8=AF=A2=E9=97=AE=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PannelCard/LeftCardControl.xaml.cs | 45 +++++++++++-------- MainWindow.xaml | 1 + 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/Control/UserControls/PannelCard/LeftCardControl.xaml.cs b/Control/UserControls/PannelCard/LeftCardControl.xaml.cs index 6a8a89d..cca4d9b 100644 --- a/Control/UserControls/PannelCard/LeftCardControl.xaml.cs +++ b/Control/UserControls/PannelCard/LeftCardControl.xaml.cs @@ -220,27 +220,34 @@ namespace GeekDesk.Control.UserControls.PannelCard /// private void DeleteMenu(object sender, RoutedEventArgs e) { - MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo; - if (appData.MenuList.Count == 1) + HandyControl.Controls.Growl.Ask("确认删除此菜单吗?", isConfirmed => { - //如果删除以后没有菜单的话 先创建一个 - CreateMenu(null, null); - } - int index = appData.MenuList.IndexOf(menuInfo); - if (index == 0) - { - index = 0; - } - else - { - index--; - } + if (isConfirmed) + { + MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo; + if (appData.MenuList.Count == 1) + { + //如果删除以后没有菜单的话 先创建一个 + CreateMenu(null, null); + } + int index = appData.MenuList.IndexOf(menuInfo); + if (index == 0) + { + index = 0; + } + else + { + index--; + } - appData.MenuList.Remove(menuInfo); - // 选中下一个菜单 - MenuListBox.SelectedIndex = index; - appData.AppConfig.SelectedMenuIndex = MenuListBox.SelectedIndex; - appData.AppConfig.SelectedMenuIcons = appData.MenuList[index].IconList; + appData.MenuList.Remove(menuInfo); + // 选中下一个菜单 + MenuListBox.SelectedIndex = index; + appData.AppConfig.SelectedMenuIndex = MenuListBox.SelectedIndex; + appData.AppConfig.SelectedMenuIcons = appData.MenuList[index].IconList; + } + return true; + }, "MainWindowAskGrowl"); } /// diff --git a/MainWindow.xaml b/MainWindow.xaml index fe10974..e5d0ba5 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -83,6 +83,7 @@ +