Преглед изворни кода

视图模块-阅读模式优化

OYXH\oyxh пре 2 година
родитељ
комит
216e1b810a

+ 2 - 6
PDF Office/ViewModels/PropertyPanel/ViewModular/ReadViewContentViewModel.cs

@@ -138,16 +138,12 @@ namespace PDF_Office.ViewModels.PropertyPanel.ViewModular
 
             if (region.Regions.ContainsRegionWithName(ReadRegionName))
             {
-                if (!region.Regions[ReadRegionName].Views.Contains(PDFViewer))
-                {
-                    region.AddToRegion(ReadRegionName, PDFViewer);
-                }
-                else
+                if (region.Regions[ReadRegionName].Views.Contains(PDFViewer))
                 {
                     var contentRegion = region.Regions[ReadRegionName];
                     contentRegion.Remove(PDFViewer);
-                    region.AddToRegion(ReadRegionName, PDFViewer);
                 }
+                region.AddToRegion(ReadRegionName, PDFViewer);
             }
 
             System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>

+ 0 - 26
PDF Office/ViewModels/ViewContentViewModel.cs

@@ -83,28 +83,6 @@ namespace PDF_Office.ViewModels
 
         public Action PageEditRedo { get; set; }
 
-        private Visibility readModeContentVisibility = Visibility.Collapsed;
-
-        public Visibility ReadModeContentVisibility
-        {
-            get { return readModeContentVisibility; }
-            set
-            {
-                SetProperty(ref readModeContentVisibility, value);
-            }
-        }
-
-        private Visibility rectangleReadModeVisibility = Visibility.Collapsed;
-
-        public Visibility RectangleReadModeVisibility
-        {
-            get { return rectangleReadModeVisibility; }
-            set
-            {
-                SetProperty(ref rectangleReadModeVisibility, value);
-            }
-        }
-
         /// <summary>
         ///工具条
         ///0:收起
@@ -998,8 +976,6 @@ namespace PDF_Office.ViewModels
         public async void RbtnReadMode(ViewContent viewContent)
         {
             App.IsBookMode = true;
-            ReadModeContentVisibility = Visibility.Visible;
-            RectangleReadModeVisibility = Visibility.Collapsed;
             IsLoading = Visibility.Visible;
             await Task.Delay(1);
 
@@ -1047,8 +1023,6 @@ namespace PDF_Office.ViewModels
         public async void UnReadModel()
         {
             App.IsBookMode = false;
-            ReadModeContentVisibility = Visibility.Collapsed;
-            RectangleReadModeVisibility = Visibility.Collapsed;
             IsLoading = Visibility.Visible;
             await Task.Delay(1);
             //region.AddToRegion(ViwerRegionName, PDFViewer);