其他-调整ViewContent 图层逻辑，方便阅读模式处理

PDF Office/Views/ViewContent.xaml

@@ -171,10 +171,26 @@
                 </i:Interaction.Triggers>
             </TabControl>
         </Grid>
-        <!--<ScrollViewer Name="PropScrollView" Grid.Row="2" SizeChanged="PropPanel_SizeChanged" VerticalScrollBarVisibility="Auto" Focusable="False">
-        <Grid x:Name="PropPanel">
-        </Grid>
-        </ScrollViewer>-->
+
+        <!--底部工具栏-->
+        <ContentControl
+            Grid.Row="3"
+            prism:RegionManager.RegionName="{Binding BottomToolRegionName}"
+            Visibility="{Binding IsReadMode}" />
+
+        <!--  专门用来显示菜单二级工具栏  -->
+        <!--  调整工具栏的显示图层，方便阅读模式处理  -->
+        <ContentControl
+            Name="ContentToolsBar"
+            Grid.Row="{Binding GridToolRow}"
+            prism:RegionManager.RegionName="{Binding ToolsBarContentRegionName}"
+            Visibility="{Binding ToolsBarContentVisible}" />
+
+        <ContentControl
+            Name="ContentConverterBar"
+            Grid.Row="{Binding GridToolRow}"
+            prism:RegionManager.RegionName="{Binding ConverterBarContentRegionName}"
+            Visibility="{Binding ConverterBarContentVisible}" />
 
         <Grid Name="DocumentView" Grid.Row="2">
             <Grid.ColumnDefinitions>
@@ -247,11 +263,6 @@
                 Visibility="Collapsed" />
         </Grid>
 
-        <ContentControl
-            Grid.Row="3"
-            prism:RegionManager.RegionName="{Binding BottomToolRegionName}"
-            Visibility="{Binding IsReadMode}" />
-
         <!--  用于显示页面编辑、水印、背景、标记密文等功能的区域  -->
         <ContentControl
             Name="ContentTool"
@@ -261,18 +272,5 @@
             Visibility="{Binding ToolContentVisible}" />
         <cus:LoadingControl Grid.RowSpan="3" Visibility="{Binding IsLoading}" />
 
-        <!--  专门用来显示菜单二级工具栏  -->
-        <ContentControl
-            Name="ContentToolsBar"
-            Grid.Row="{Binding GridToolRow}"
-            prism:RegionManager.RegionName="{Binding ToolsBarContentRegionName}"
-            Visibility="{Binding ToolsBarContentVisible}" />
-
-        <ContentControl
-            Name="ContentConverterBar"
-            Grid.Row="{Binding GridToolRow}"
-            prism:RegionManager.RegionName="{Binding ConverterBarContentRegionName}"
-            Visibility="{Binding ConverterBarContentVisible}" />
-
     </Grid>
 </UserControl>

PDF Office/Views/ViewContent.xaml.cs

@@ -48,9 +48,9 @@ namespace PDF_Office.Views
             {
                 viewModel.IsReadMode = Visibility.Collapsed;
                 viewModel.IsPropertyOpen = false;
-                viewModel.ToolContentVisible = Visibility.Collapsed;
-                viewModel.ToolsBarContentVisible = Visibility.Collapsed;
-                viewModel.ConverterBarContentVisible = Visibility.Collapsed;
+                //viewModel.ToolContentVisible = Visibility.Collapsed;
+                //viewModel.ToolsBarContentVisible = Visibility.Collapsed;
+                //viewModel.ConverterBarContentVisible = Visibility.Collapsed;
                 this.ReadModeContent.Visibility = Visibility.Visible;
                 this.RectangleReadMode.Visibility = Visibility.Collapsed;
                 Grid.SetColumn(this.PDFViewerContent, 0);
@@ -62,18 +62,18 @@ namespace PDF_Office.Views
             {
                 viewModel.IsReadMode = Visibility.Visible;
                 viewModel.IsPropertyOpen = true;
-                if (viewModel.CurrentBar == "TabItemConvert")
-                {
-                    viewModel.ConverterBarContentVisible = Visibility.Visible;
-                }
-                else if (viewModel.CurrentBar == "TabItemPageEdit")
-                {
-                    viewModel.ToolContentVisible = Visibility.Visible;
-                }
-                else
-                {
-                    viewModel.ToolsBarContentVisible = Visibility.Visible;
-                }
+                //if (viewModel.CurrentBar == "TabItemConvert")
+                //{
+                //    viewModel.ConverterBarContentVisible = Visibility.Visible;
+                //}
+                //else if (viewModel.CurrentBar == "TabItemPageEdit")
+                //{
+                //    viewModel.ToolContentVisible = Visibility.Visible;
+                //}
+                //else
+                //{
+                //    viewModel.ToolsBarContentVisible = Visibility.Visible;
+                //}
                 //viewModel.ToolContentVisible = Visibility.Visible;
 
                 this.ReadModeContent.Visibility = Visibility.Collapsed;