其他 - 五合一模块的页码，和常规页面内容显示

Demo/Examples/Compdfkit_Tools/Annotation/AnnotationControl/AnnotationControl.xaml.cs

@@ -102,9 +102,9 @@ namespace Compdfkit_Tools.PDFControl
         }
 
         #region Init PDFViewer
-        public void InitWithPDFViewer(CPDFViewer pdfViewer)
+        public void InitWithPDFViewer(PDFViewControl pdfViewer)
         {
-            //PDFViewControl.PDFView = pdfViewer;
+            PDFViewControl = pdfViewer;
             PDFGrid.Child = PDFViewControl;
             FloatPageTool.InitWithPDFViewer(PDFViewControl);
             InitialPDFViewControl(PDFViewControl);

Demo/Examples/Compdfkit_Tools/Common/BaseControl/PageNumberControl.xaml.cs

@@ -1,4 +1,6 @@
-using Compdfkit_Tools.PDFControl;
+using ComPDFKit.Tool;
+using Compdfkit_Tools.PDFControl;
+using ComPDFKitViewer;
 using System;
 using System.Collections.Generic;
 using System.Windows;
@@ -20,26 +22,27 @@ namespace Compdfkit_Tools.Common
         {
             if (pdfView != newPDFView)
             {
-                //if(pdfView != null)
-                //{
-                //    pdfView.InfoChanged -= PdfView_InfoChanged;
-                //}
+                if (pdfView != null)
+                {
+                    pdfView.PDFViewTool.DrawChanged -= PdfView_InfoChanged;
+                }
                 pdfView = newPDFView;
-                //if(pdfView != null)
-                //{
-                //    pdfView.InfoChanged += PdfView_InfoChanged;
-                //}
+                if (pdfView != null)
+                {
+                    pdfView.PDFViewTool.DrawChanged += PdfView_InfoChanged;
+                }
             }
         }
 
-        private void PdfView_InfoChanged(object sender, KeyValuePair<string, object> e)
+        private void PdfView_InfoChanged(object sender, EventArgs e)
         {
-            if (e.Key == "PageNum")
+            if (sender is CPDFViewerTool)
             {
-                PageRangeText.Text = string.Format("{0}/{1}", e.Value, pdfView.PDFViewTool.GetCPDFViewer().CurrentRenderFrame.PageIndex);
+                PageRangeText.Text = string.Format("{0}/{1}", (sender as CPDFViewerTool).GetCPDFViewer().CurrentRenderFrame.PageIndex+1, (sender as CPDFViewerTool).GetCPDFViewer().GetDocument().PageCount);
             }
         }
 
+
         private void NextPageBorder_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             SetPageRangeVisible();

Demo/Examples/Compdfkit_Tools/PDFView/PDFViewControl/PDFViewControl.xaml.cs

@@ -28,10 +28,16 @@ namespace Compdfkit_Tools.PDFControl
             PDFViewTool = new CPDFViewerTool();
             Content = PDFViewTool;
             PDFViewTool.GetCPDFViewer().MouseWheelZoomHandler += PDFViewControl_MouseWheelZoomHandler;
+            PDFViewTool.SizeChanged += PDFViewTool_SizeChanged;
             PDFToolManager = new CPDFToolManager(PDFViewTool);
             //PDFToolManager.SetToolType(CPDFToolManager.ToolType.Viewer);
         }
 
+        private void PDFViewTool_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            PDFViewTool.GetCPDFViewer().UpDataRenderFrame();
+        }
+
         public void InitDocument(string Path)
         {
             CPDFDocument pdfDoc = CPDFDocument.InitWithFilePath(Path);

Demo/Examples/PDFViewer/MainPage.xaml.cs

@@ -365,7 +365,7 @@ namespace PDFViewer
                     //viewControl.PDFView.SetMouseMode(MouseModes.AnnotCreate);
                     //annotationControl.PDFViewControl.PDFView.SetToolParam(new AnnotHandlerEventArgs());
                     annotationControl.PDFViewControl = viewControl;
-                    //annotationControl.InitWithPDFViewer(viewControl);
+                    annotationControl.InitWithPDFViewer(viewControl);
                     annotationControl.OnCanSaveChanged -= ControlOnCanSaveChanged;
                     annotationControl.OnCanSaveChanged += ControlOnCanSaveChanged;
                     annotationControl.OnAnnotEditHandler -= PdfFormControlRefreshAnnotList;