ComPDFKit(win) - 部分Bug修复

Demo/Examples/Compdfkit_Tools/Annotation/PDFAnnotationPanel/PDFAnnotationUI/CPDFLinkUI.xaml.cs

@@ -113,7 +113,7 @@ namespace Compdfkit_Tools.Annotation.PDFAnnotationUI
 
             if (param.Action==C_ACTION_TYPE.ACTION_TYPE_GOTO)
             {
-                PageText.Text = param.PageIndex.ToString();
+                PageText.Text = (param.DestinationPageIndex + 1).ToString();
                 SelectedIndex = 1;
             }
 

Demo/Examples/Compdfkit_Tools/DigitalSignature/DigitalSignatureControl/DigitalSignatureControl.xaml.cs

@@ -139,11 +139,6 @@ namespace Compdfkit_Tools.PDFControl
             DigitalSignatureBarControl.DigitalSignatureActionChanged -= DigitalSignatureBarControl_DigitalSignatureActionChanged;
             DigitalSignatureBarControl.DigitalSignatureActionChanged += DigitalSignatureBarControl_DigitalSignatureActionChanged;
             
-            //PDFViewControl.PDFView.WidgetClickHandler -= PDFView_WidgetClickHandler;
-            //PDFViewControl.PDFView.WidgetClickHandler += PDFView_WidgetClickHandler;
-            //PDFViewControl.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
-            //PDFViewControl.PDFView.AnnotCommandHandler += PDFView_AnnotCommandHandler;
-            
             PDFViewControl.PDFViewTool.MouseLeftButtonDownHandler -= PDFViewControl_MouseLeftButtonDownHandler;
             PDFViewControl.PDFViewTool.MouseLeftButtonDownHandler += PDFViewControl_MouseLeftButtonDownHandler;
             
@@ -641,9 +636,8 @@ namespace Compdfkit_Tools.PDFControl
         /// <param name="e"></param>
         private void UserControl_Unloaded(object sender, RoutedEventArgs e)
         {
-            //PDFViewControl.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
-            //PDFViewControl.PDFView.WidgetClickHandler -= PDFView_WidgetClickHandler;
             PDFViewControl.PDFViewTool.MouseRightButtonDownHandler -= PDFViewControl_MouseRightButtonDownHandler;
+            PDFViewControl.PDFViewTool.MouseLeftButtonDownHandler -= PDFViewControl_MouseLeftButtonDownHandler;
         }
         
         #endregion

Demo/Examples/Compdfkit_Tools/Form/Property/ListBoxProperty.xaml.cs

@@ -57,7 +57,7 @@ namespace Compdfkit_Tools.PDFControl
             SizeListbinding.Source = this;
             SizeListbinding.Path = new System.Windows.PropertyPath("SizeList");
             FontSizeCmb.SetBinding(ComboBox.ItemsSourceProperty, SizeListbinding);
-             
+            FieldNameText.Text = widgetParam.FieldName;
             FormFieldCmb.SelectedIndex = (int)ParamConverter.ConverterWidgetFormFlags(widgetParam.Flags, widgetParam.IsHidden);
             BorderColorPickerControl.SetCheckedForColor(ParamConverter.ConverterByteForColor(widgetParam.LineColor));
             BackgroundColorPickerControl.SetCheckedForColor(ParamConverter.ConverterByteForColor(widgetParam.BgColor));

Demo/Examples/Compdfkit_Tools/Form/Property/PushButtonProperty.xaml.cs

@@ -68,7 +68,7 @@ namespace Compdfkit_Tools.PDFControl
             SizeListbinding.Source = this;
             SizeListbinding.Path = new System.Windows.PropertyPath("SizeList");
             FontSizeCmb.SetBinding(ComboBox.ItemsSourceProperty, SizeListbinding);
-
+            FieldNameText.Text = widgetParam.FieldName;
             TopTabControl.SelectedIndex = 2; 
 
             FormFieldCmb.SelectedIndex = (int)ParamConverter.ConverterWidgetFormFlags(widgetParam.Flags, widgetParam.IsHidden);

Demo/Examples/Compdfkit_Tools/Form/Property/TextFieldProperty.xaml

@@ -79,9 +79,9 @@
                             <ComboBox x:Name="FontCmb" Height="28" Margin="0,8,0,0" Style="{StaticResource ComboBoxStyle1}" SelectedIndex="0" SelectionChanged="FontCmb_SelectionChanged" PreviewMouseDown="FontCmb_PreviewMouseDown">
                             </ComboBox>
                             <StackPanel Orientation="Horizontal"  Height="28" Margin="0,8,0,0">
-                                <ComboBox x:Name="FontStyleCmb" Width="148" Style="{StaticResource ComboBoxStyle1}" SelectedIndex="0" SelectionChanged="FontStyleCmb_SelectionChanged" PreviewMouseDown="FontStyleCmb_PreviewMouseDown">
+                                <ComboBox x:Name="FontStyleCmb"  Margin="0,0,0,0" Width="148" Style="{StaticResource ComboBoxStyle1}" SelectedIndex="0" SelectionChanged="FontStyleCmb_SelectionChanged" PreviewMouseDown="FontStyleCmb_PreviewMouseDown">
                                 </ComboBox>
-                                <ComboBox x:Name="FontSizeCmb" Width="72" Style="{StaticResource ComboBoxStyle1}" SelectedIndex="0" SelectionChanged="FontSizeCmb_SelectionChanged" Margin="12,0,0,0"/>
+                                <ComboBox x:Name="FontSizeCmb" Margin="4,0,0,0" Width="72" Style="{StaticResource ComboBoxStyle1}" SelectedIndex="0" SelectionChanged="FontSizeCmb_SelectionChanged"/>
                             </StackPanel>
                         </StackPanel>
                     </StackPanel>

Demo/Examples/Compdfkit_Tools/PDFView/PDFSearch/PDFSearchControl/CPDFSearchControl.xaml.cs

@@ -260,15 +260,6 @@ namespace Compdfkit_Tools.PDFControl
                 SearchResult.SetSearchResult(resultList);
                 ResultCount=resultList.Count;
                 ViewControl.PDFViewTool?.SetPageSelectText(totalItems);
-
-                if (resultList==null ||  resultList.Count==0)
-                {
-                    ResultText.Text= string.Empty;
-                }
-                else
-                {
-                    ResultText.Text = string.Format("{0} results found", ResultCount);
-                }
             });
         }
 

Demo/Examples/PDFViewer/MainPage.xaml.cs

@@ -620,7 +620,7 @@ namespace PDFViewer
                 {
                     RightPanelButton.Visibility = Visibility.Collapsed;
                     PDFGrid.Child = digitalSignatureControl;
-                    viewControl.PDFViewTool.SetViewerModel(MouseModes.PanTool);
+                    viewControl.PDFViewTool.SetViewerModel(MouseModes.Viewer);
                     digitalSignatureControl.PDFViewControl = viewControl;
                     botaBarControl.AddBOTAContent(BOTATools.Signature);
                     digitalSignatureControl.InitWithPDFViewer(viewControl);