Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -188,6 +188,7 @@ namespace PDF_Master.ViewModels.Tools
 
             if (annotBtn.IsChecked == true)
             {
+                PDFViewer.ToolManager.DisableStickyCreate = false;
                 PropertyPanel.AnnotSelect = StrAnnotToolChecked;
                 PropertyPanel.SaveLastAnnot();
                 MyToolCheckedDoing(dictVar, tag);

PDF Office/Views/PropertyPanel/AnnotPanel/StickyNotePopup.xaml.cs

@@ -265,6 +265,8 @@ namespace PDF_Master.Views.PropertyPanel.AnnotPanel
             {
                 Closed.Invoke(sender, EventArgs.Empty);
             }
+          
+           
         }
 
         protected override void OnMouseDown(MouseButtonEventArgs e)
@@ -418,11 +420,19 @@ namespace PDF_Master.Views.PropertyPanel.AnnotPanel
         {
             if (GetPDFViewer != null)
             {
+               
                 if (GetCurrentAnnot != null)
+                {
                     GetPDFViewer.RemovePageAnnot(GetCurrentAnnot.PageIndex, GetCurrentAnnot.AnnotIndex);
+                }
+                
 
                 // Closed.Invoke(sender, EventArgs.Empty);
                 CloseText_MouseUp(this, null);
+                if (GetPDFViewer.ToolManager != null)
+                {
+                    GetPDFViewer.ToolManager.DisableStickyCreate = false;
+                }
             }
         }