Browse Source

视图-阅读模式优化

OYXH\oyxh 2 years ago
parent
commit
377d0f7745
1 changed files with 8 additions and 18 deletions
  1. 8 18
      PDF Office/Views/ViewContent.xaml.cs

+ 8 - 18
PDF Office/Views/ViewContent.xaml.cs

@@ -3,6 +3,7 @@ using PDF_Office.ViewModels;
 using PDF_Office.Views.PropertyPanel.ViewModular;
 using System;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -29,7 +30,7 @@ namespace PDF_Office.Views
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        public void RbtnReadMode_Click(object sender, RoutedEventArgs e)
+        public void RbtnReadMode(object sender, RoutedEventArgs e)
         {
             if (viewModel != null)
             {
@@ -42,17 +43,18 @@ namespace PDF_Office.Views
         /// 设置阅读模式下的控件
         /// </summary>
         /// <param name="isBookMode"></param>
-        private void SetReadMode(bool isBookMode)
+        private async void SetReadMode(bool isBookMode)
         {
             if (isBookMode)
             {
                 viewModel.IsReadMode = Visibility.Collapsed;
                 viewModel.IsPropertyOpen = false;
-                //viewModel.ToolContentVisible = Visibility.Collapsed;
-                //viewModel.ToolsBarContentVisible = Visibility.Collapsed;
-                //viewModel.ConverterBarContentVisible = Visibility.Collapsed;
+
+                await Task.Delay(1);
+
                 this.ReadModeContent.Visibility = Visibility.Visible;
                 this.RectangleReadMode.Visibility = Visibility.Collapsed;
+
                 Grid.SetColumn(this.PDFViewerContent, 0);
                 Grid.SetColumnSpan(this.PDFViewerContent, 4);
                 Grid.SetRow(this.DocumentView, 0);
@@ -62,22 +64,10 @@ 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;
-                //}
-                //viewModel.ToolContentVisible = Visibility.Visible;
 
                 this.ReadModeContent.Visibility = Visibility.Collapsed;
                 this.RectangleReadMode.Visibility = Visibility.Visible;
+                await Task.Delay(1);
                 Grid.SetColumn(this.PDFViewerContent, 2);
                 Grid.SetColumnSpan(this.PDFViewerContent, 1);
                 Grid.SetRow(this.DocumentView, 2);