BOTA-修复切换页签，会导致展开的BOTA自动收起的情况

PDF Office/Views/BOTA/BOTAContent.xaml

@@ -37,36 +37,43 @@
                         Name="MenuThumbnail"
                         Header="{Binding Source={x:Reference Name=TabItemThumbnail}, Path=Name}"
                         IsCheckable="True"
-                        IsChecked="True" />
+                        IsChecked="True"
+                        Unchecked="MenuThumbnail_Unchecked" />
                     <MenuItem
                         Name="MenuOutLine"
                         Header="{Binding Source={x:Reference Name=TabItemOutLine}, Path=Name}"
                         IsCheckable="True"
-                        IsChecked="True" />
+                        IsChecked="True"
+                        Unchecked="MenuThumbnail_Unchecked" />
                     <MenuItem
                         Name="MenuBookMark"
                         Header="{Binding Source={x:Reference Name=TabItemBookMark}, Path=Name}"
                         IsCheckable="True"
-                        IsChecked="True" />
+                        IsChecked="True"
+                        Unchecked="MenuThumbnail_Unchecked" />
                     <MenuItem
                         Name="MenuAnnotation"
                         Header="{Binding Source={x:Reference Name=TabItemAnnotation}, Path=Name}"
                         IsCheckable="True"
-                        IsChecked="True" />
+                        IsChecked="True"
+                        Unchecked="MenuThumbnail_Unchecked" />
                     <MenuItem
                         Name="MenuSearch"
                         Header="{Binding Source={x:Reference Name=TabItemSearch}, Path=Name}"
                         IsCheckable="True"
-                        IsChecked="True" />
+                        IsChecked="True"
+                        Unchecked="MenuThumbnail_Unchecked" />
                     <MenuItem
                         Name="MenuFrom"
                         Header="{Binding Source={x:Reference Name=TabItemForm}, Path=Name}"
                         IsCheckable="True"
+                        Unchecked="MenuThumbnail_Unchecked"
                         Visibility="Collapsed" />
                     <MenuItem
                         Name="MenuSign"
                         Header="{Binding Source={x:Reference Name=TabItemSign}, Path=Name}"
                         IsCheckable="True"
+                        Unchecked="MenuThumbnail_Unchecked"
                         Visibility="Collapsed" />
                 </ContextMenu>
             </Border.ContextMenu>
@@ -93,7 +100,6 @@
                 x:Name="TabItemThumbnail"
                 Width="48"
                 Height="48"
-                IsVisibleChanged="TabItemThumbnail_IsVisibleChanged"
                 ToolTip="{Binding Tip_Thumbnail}"
                 Visibility="{Binding ElementName=MenuThumbnail, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}">
                 <customcontrol:IconAndTextTabItem.NormalPathIcon>
@@ -108,7 +114,6 @@
                 Width="48"
                 Height="48"
                 Header="大纲"
-                IsVisibleChanged="TabItemThumbnail_IsVisibleChanged"
                 ToolTip="{Binding Tip_OutLine}"
                 Visibility="{Binding ElementName=MenuOutLine, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}">
                 <customcontrol:IconAndTextTabItem.NormalPathIcon>
@@ -123,7 +128,6 @@
                 Width="48"
                 Height="48"
                 Header="书签"
-                IsVisibleChanged="TabItemThumbnail_IsVisibleChanged"
                 ToolTip="{Binding Tip_BookMark}"
                 Visibility="{Binding ElementName=MenuBookMark, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}">
                 <customcontrol:IconAndTextTabItem.NormalPathIcon>
@@ -138,7 +142,6 @@
                 Width="48"
                 Height="48"
                 Header="注释"
-                IsVisibleChanged="TabItemThumbnail_IsVisibleChanged"
                 ToolTip="{Binding Tip_Annote}"
                 Visibility="{Binding ElementName=MenuAnnotation, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}">
                 <customcontrol:IconAndTextTabItem.NormalPathIcon>
@@ -153,7 +156,6 @@
                 Width="48"
                 Height="48"
                 Header="搜索"
-                IsVisibleChanged="TabItemThumbnail_IsVisibleChanged"
                 ToolTip="{Binding Tip_Search}"
                 Visibility="{Binding ElementName=MenuSearch, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}">
                 <customcontrol:IconAndTextTabItem.NormalPathIcon>
@@ -168,14 +170,12 @@
                 Width="48"
                 Height="48"
                 Header="域"
-                IsVisibleChanged="TabItemThumbnail_IsVisibleChanged"
                 Visibility="{Binding ElementName=MenuFrom, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}" />
             <customcontrol:IconAndTextTabItem
                 x:Name="TabItemSign"
                 Width="48"
                 Height="48"
                 Header="签名"
-                IsVisibleChanged="TabItemThumbnail_IsVisibleChanged"
                 Visibility="{Binding ElementName=MenuSign, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}" />
             <i:Interaction.Triggers>
                 <i:EventTrigger EventName="SelectionChanged">

PDF Office/Views/BOTA/BOTAContent.xaml.cs

@@ -32,18 +32,6 @@ namespace PDF_Master.Views.BOTA
 
         }
 
-        private void TabItemThumbnail_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            var item = sender as TabItem;
-            if(item!=null&&item.IsSelected)
-            {
-                if(!(bool)e.NewValue)
-                {
-                    (this.DataContext as BOTAContentViewModel).viewContentViewModel.OpenBOTA = false;
-                }
-            }
-        }
-
         private void IconAndTextTabItem_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             var item = sender as TabItem;
@@ -55,5 +43,59 @@ namespace PDF_Master.Views.BOTA
                 e.Handled = true;
             }
         }
+
+        private void MenuThumbnail_Unchecked(object sender, RoutedEventArgs e)
+        {
+            //取消勾选后，如果是将选中的tabitem隐藏了，需要收起侧边栏
+            var menuitem = sender as MenuItem;
+            switch (menuitem.Name)
+            {
+                case "MenuThumbnail":
+                    if(TabItemThumbnail.IsSelected)
+                    {
+                        (this.DataContext as BOTAContentViewModel).viewContentViewModel.OpenBOTA = false;
+                    }
+                    break;
+                case "MenuOutLine":
+                    if (TabItemOutLine.IsSelected)
+                    {
+                        (this.DataContext as BOTAContentViewModel).viewContentViewModel.OpenBOTA = false;
+                    }
+                    break;
+                case "MenuBookMark":
+                    if (TabItemBookMark.IsSelected)
+                    {
+                        (this.DataContext as BOTAContentViewModel).viewContentViewModel.OpenBOTA = false;
+                    }
+                    break;
+                case "MenuAnnotation":
+                    if (TabItemAnnotation.IsSelected)
+                    {
+                        (this.DataContext as BOTAContentViewModel).viewContentViewModel.OpenBOTA = false;
+                    }
+                    break;
+                case "MenuSearch":
+                    if (TabItemSearch.IsSelected)
+                    {
+                        (this.DataContext as BOTAContentViewModel).viewContentViewModel.OpenBOTA = false;
+                    }
+                    break;
+                case "MenuFrom":
+                    if (TabItemForm.IsSelected)
+                    {
+                        (this.DataContext as BOTAContentViewModel).viewContentViewModel.OpenBOTA = false;
+                    }
+                    break;
+                case "MenuSign":
+                    if (TabItemSign.IsSelected)
+                    {
+                        (this.DataContext as BOTAContentViewModel).viewContentViewModel.OpenBOTA = false;
+                    }
+                    break;
+                default:
+                    break;
+            }
+
+        }
     }
 }