注释-优化悬浮便签框

PDF Office/ViewModels/BottomToolContentViewModel.cs

@@ -346,34 +346,16 @@ namespace PDF_Master.ViewModels
 
         private void ShowViewModularEvent(object obj)
         {
-       
             if (region.Regions.ContainsRegionWithName(ViewContentViewModel.PropertyRegionName))
             {
                 var check = (bool)obj;
                 if (check)
                 {
                     ViewContentViewModel.IsPropertyOpen = true;
-                    //NavigationParameters param = new NavigationParameters();
-                    //param.Add(ParameterNames.PDFViewer, PDFViewer);
-                    //param.Add(ParameterNames.BottomToolContentViewModel, this);
-                    //region.RequestNavigate(RegionNames.PropertyRegionName, "ViewModularContent", param);
-                    var views = region.Regions[ViewContentViewModel.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[ViewContentViewModel.PropertyRegionName];
-                            contentRegion.Activate(viewModular);
-                        }
-                    }
+                    NavigationParameters param = new NavigationParameters();
+                    param.Add(ParameterNames.PDFViewer, PDFViewer);
+                    param.Add(ParameterNames.BottomToolContentViewModel, this);
+                    region.RequestNavigate(RegionNames.PropertyRegionName, "ViewModularContent", param);
                 }
                 else
                 {

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

@@ -1166,7 +1166,7 @@ namespace PDF_Master.ViewModels.Tools
                     hoverRect = new Rect(
                    e.PaintRect.Left - 2,
                    e.PaintRect.Top + 5,
-                   e.PaintRect.Width + 4,
+                   e.PaintRect.Width + 8,
                    e.PaintRect.Height + 2);
                 }