便签弹窗BUG

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

@@ -140,7 +140,7 @@ namespace PDF_Master.ViewModels.Tools
         #endregion 事件绑定和解绑
 
         #region 与触发事件调用相关的函数
-
+        public StickyAnnotArgs GetCurrentAnnot { get; set; }
         //鼠标左键双击注释
         private void PDFViewer_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
@@ -201,6 +201,10 @@ namespace PDF_Master.ViewModels.Tools
 
                     if (type == AnnotArgsType.AnnotSticky)
                     {
+                        customStickyPopup.GetCurrentAnnot = GetCurrentAnnot;
+                        customStickyPopup.GetPDFViewer = PDFViewer;
+                        //多个文档时候，未知原因弹窗对象没有更改，导致PDFViewer以及GetCurrentAnnot，没有及时刷新
+                        PDFViewer.SetStickyNotePop(customStickyPopup);
                         (CurrentSelectedAnnot as StickyAnnotArgs).PopupEditWnd();
                     }
                 }
@@ -322,8 +326,7 @@ namespace PDF_Master.ViewModels.Tools
 
                 case AnnotArgsType.AnnotSticky:
                     GetStickyNote(e.AnnotItemsList);
-                    customStickyPopup.GetCurrentAnnot = e.AnnotItemsList[0] as StickyAnnotArgs;
-                    customStickyPopup.GetPDFViewer = PDFViewer;
+                    GetCurrentAnnot = e.AnnotItemsList[0] as StickyAnnotArgs;
                     if (e.IsAnnotCreateReset)
                     {
                         PropertyPanel.annot = e.AnnotItemsList[0];