综合-手绘注释 悬浮框不显示、退出阅读模式

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Command.cs

@@ -1325,7 +1325,7 @@ namespace PDF_Master.ViewModels.Tools
                         return;
                     }
                 }
-                if (StrAnnotToolChecked == "Freehand")
+                if (StrAnnotToolChecked == "Freehand" || (IsNoSelectMenu && isRightMenuAddAnnot))
                 {
                     return;
                 }

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -435,8 +435,10 @@ namespace PDF_Master.ViewModels.Tools
                 viewContentViewModel.IsRightMenuCreateLink = false;
 
                 IsNoSelectMenu = true;
+                isRightMenuAddAnnot = false;
                 if (str == AddAnnotType.AnnotFreehand.ToString())
                 {
+                    isRightMenuAddAnnot = true;
                     annotHandler = GetFreehand();
                 }
                 if (str == AddAnnotType.AnnotFreeText.ToString())

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -45,6 +45,7 @@ using Dropbox.Api.Files;
 using System.Windows.Media;
 using Color = System.Windows.Media.Color;
 using PDFSettings;
+using PDF_Master.Views;
 
 namespace PDF_Master.ViewModels
 {
@@ -1934,30 +1935,23 @@ namespace PDF_Master.ViewModels
                 }
             }
             ///退出阅读模式 显示视图面板
-            IsPropertyOpen = true;
-            if (region.Regions.ContainsRegionWithName(PropertyRegionName))
+            //IsPropertyOpen = true;
+            //if (region.Regions.ContainsRegionWithName(PropertyRegionName))
+            //{
+            //    NavigationParameters param = new NavigationParameters();
+            //    param.Add(ParameterNames.PDFViewer, PDFViewer);
+            //    param.Add(ParameterNames.BottomToolContentViewModel, this);
+            //    region.RequestNavigate(RegionNames.PropertyRegionName, "ViewModularContent", param);
+            //}
+            if (region.Regions.ContainsRegionWithName(BottomToolRegionName))
             {
-                NavigationParameters param = new NavigationParameters();
-                param.Add(ParameterNames.PDFViewer, PDFViewer);
-                param.Add(ParameterNames.BottomToolContentViewModel, this);
-                region.RequestNavigate(RegionNames.PropertyRegionName, "ViewModularContent", param);
-                //var views = region.Regions[PropertyRegionName].Views;
-                //var item = views.FindFirst(p => p is ViewModularContent);
-                //if (item == null)
-                //{
-                //    NavigationParameters param = new NavigationParameters();
-                //    param.Add(ParameterNames.PDFViewer, PDFViewer);
-                //    param.Add(ParameterNames.BottomToolContentViewModel, this);
-                //    region.RequestNavigate(RegionNames.PropertyRegionName, "ViewModularContent", param);
-                //}
-                //else
-                //{
-                //    if (item is ViewModularContent viewModular)
-                //    {
-                //        var contentRegion = region.Regions[PropertyRegionName];
-                //        contentRegion.Activate(viewModular);
-                //    }
-                //}
+                var views = region.Regions[BottomToolRegionName].Views;
+                var isHasView = views.FindFirst(q => q is BottomToolContent);
+                if (isHasView is BottomToolContent bottomToolContent)
+                {
+                    BottomToolContentViewModel toolContentViewModel = bottomToolContent.DataContext as BottomToolContentViewModel;
+                    toolContentViewModel.IsShowViewModular = false;
+                }
             }
 
             IsLoading = Visibility.Collapsed;
@@ -1970,8 +1964,6 @@ namespace PDF_Master.ViewModels
             await Task.Delay(3000);
             //ReadModelTip = Visibility.Collapsed;
             TipVisible = Visibility.Collapsed;
-
-
         }
 
         #region PDFViewer鼠标滚轮缩放事件
@@ -2024,7 +2016,6 @@ namespace PDF_Master.ViewModels
                 App.IsShowRegist = false;
             }
 
-
             var mainVM = navigationContext.Parameters[ParameterNames.MainViewModel] as MainContentViewModel;
             if (mainVM != null)
             {