compdfkit demo windows - 修改文件选择菜单返回值类型

compdfkit_demo_windows/compdfkit/annotation-ctrl-demo/MainWindow.xaml.cs

@@ -1,5 +1,7 @@
-using compdfkit_tools.Annotation.PDFAnnotationControl;
+using ComPDFKit.PDFDocument;
+using compdfkit_tools.Annotation.PDFAnnotationControl;
 using compdfkit_tools.PDFControl;
+using ComPDFKitViewer;
 using ComPDFKitViewer.PdfViewer;
 using System;
 using System.Collections.Generic;
@@ -24,7 +26,7 @@ namespace annotation_ctrl_demo
     /// </summary>
     public partial class MainWindow : Window
     {
-        private CPDFViewer pdfViewer;
+        private CPDFViewer pdfViewer=new CPDFViewer();
 
         public MainWindow()
         {
@@ -82,16 +84,16 @@ namespace annotation_ctrl_demo
             }
         }
 
-        private void TitleBarControl_OpenFileEvent(object sender, CPDFViewer e)
+        private void TitleBarControl_OpenFileEvent(object sender, string filePath)
         {
-            this.pdfViewer = TitleBarControl.pdfViewer;
+            pdfViewer?.CloseDocument();
+            pdfViewer?.InitDocument(filePath);
             LoadDocument();
         }
 
         private void TitleBarControl_Loaded(object sender, RoutedEventArgs e)
         {
             TitleBarControl.OpenFileEvent += TitleBarControl_OpenFileEvent;
-
         }
 
         private UIElement GetPropertyPanel()

compdfkit_demo_windows/compdfkit/compdfkit-tools/Common/BarControl/TitleBarControl.xaml.cs

@@ -23,9 +23,7 @@ namespace compdfkit_tools.PDFControl
     /// 
     public partial class TitleBarControl : UserControl
     {
-        public CPDFViewer pdfViewer;
-
-        public event EventHandler<CPDFViewer> OpenFileEvent;
+        public event EventHandler<string> OpenFileEvent;
 
         public TitleBarControl()
         {
@@ -40,14 +38,7 @@ namespace compdfkit_tools.PDFControl
                 string filePath = CommonHelper.GetFilePathOrEmpty();
                 if (!string.IsNullOrEmpty(filePath))
                 {
-                    pdfViewer?.CloseDocument();
-                    pdfViewer = new CPDFViewer();
-                    pdfViewer.InitDocument(filePath);
-                    OpenFileEvent?.Invoke(sender, pdfViewer);
-                    SolidColorBrush solidColorBrush = new SolidColorBrush(Color.FromArgb(255, 0, 0, 255));
-                    byte[] by = { 1, 0, 0 };
-                    pdfViewer.Document.GetBackground().SetColor(by);
-
+                    OpenFileEvent?.Invoke(sender, filePath);
                 }
             }
         }

compdfkit_demo_windows/compdfkit/viewer-ctrl-demo/MainWindow.xaml.cs

@@ -66,9 +66,11 @@ namespace viewer_ctrl_demo
             TitleBarControl.OpenFileEvent += TitleBarControl_OpenFileEvent;
         }
 
-        private void TitleBarControl_OpenFileEvent(object sender, CPDFViewer e)
+        private void TitleBarControl_OpenFileEvent(object sender, string filePath)
         {
-            this.pdfViewer = TitleBarControl.pdfViewer;
+            pdfViewer?.CloseDocument();
+            pdfViewer = new CPDFViewer();
+            pdfViewer.InitDocument(filePath);
             LoadDocument();
         }