Browse Source

BOTA- 调整侧边栏点击逻辑

ZhouJieSheng 1 year ago
parent
commit
7d9a41ef98

+ 4 - 1
PDF Office/ViewModels/BOTA/BOTAContentViewModel.cs

@@ -129,7 +129,10 @@ namespace PDF_Master.ViewModels.BOTA
                 if (!string.IsNullOrEmpty((args.AddedItems[0] as TabItem).Name))
                 {
                     EnterSelectedBar((args.AddedItems[0] as TabItem).Name);
-                    viewContentViewModel.OpenBOTA = true;
+                    if((args.AddedItems[0] as TabItem).IsSelected)
+                    {
+                        viewContentViewModel.OpenBOTA = true;
+                    }
                 }
             }
         }

+ 11 - 2
PDF Office/Views/BOTA/BOTAContent.xaml.cs

@@ -33,8 +33,17 @@ namespace PDF_Master.Views.BOTA
             if (item != null)
             {
                 ///重复点击选中项时,收起侧边栏
-                (this.DataContext as BOTAContentViewModel).viewContentViewModel.OpenBOTA = !(this.DataContext as BOTAContentViewModel).viewContentViewModel.OpenBOTA;
-                item.IsSelected = !item.IsSelected;
+                if (item.IsSelected)
+                {
+                    (this.DataContext as BOTAContentViewModel).viewContentViewModel.OpenBOTA = false;
+                    item.IsSelected = false;
+                }
+                else
+                {
+                    (this.DataContext as BOTAContentViewModel).viewContentViewModel.OpenBOTA = true;
+                    item.IsSelected = true;
+                }
+
                 e.Handled = true;
             }
         }