Переглянути джерело

compdfkit(win) - radio button使用同一个组名

liuaoran 10 місяців тому
батько
коміт
90498bbc10

+ 1 - 1
Demo/Examples/Compdfkit_Tools/Form/FormControl/FormControl.xaml.cs

@@ -143,7 +143,7 @@ namespace Compdfkit_Tools.PDFControl
                             widget.SetFieldName("Checkbox" + GetTime());
                             break;
                         case C_WIDGET_TYPE.WIDGET_RADIOBUTTON:
-                            widget.SetFieldName("Radio button" + GetTime());
+                            widget.SetFieldName("Radio button");
                             break;
                         case C_WIDGET_TYPE.WIDGET_TEXTFIELD:
                             widget.SetFieldName("Text" + GetTime());

+ 4 - 13
Demo/Examples/Compdfkit_Tools/PDFView/PDFViewControl/PDFViewControl.xaml.cs

@@ -190,8 +190,8 @@ namespace Compdfkit_Tools.PDFControl
             MouseLeftButtonDownHandler?.Invoke(sender, e);
             ToolType toolType = PDFToolManager.GetToolType();
 
-            if (e.hitTestType != MouseHitTestType.Text && e.hitTestType != MouseHitTestType.SelectedPageRect && e.hitTestType != MouseHitTestType.Annot && e.hitTestType != MouseHitTestType.SelectRect)
-            { 
+            if (e.hitTestType != MouseHitTestType.Text && e.hitTestType != MouseHitTestType.SelectedPageRect && e.hitTestType != MouseHitTestType.Annot && e.hitTestType != MouseHitTestType.SelectRect && e.hitTestType != MouseHitTestType.Widget)
+            {
                 if (toolType == ToolType.Pan)
                 {
                     IsHitEmpty = true;
@@ -653,20 +653,11 @@ namespace Compdfkit_Tools.PDFControl
 
                     if (hitAnnot != null)
                     {
-                        newCursor = Cursors.Arrow;
-                        if (hitAnnot is LinkAnnot)
+                        newCursor = annotEditCursor;
+                        if (hitAnnot is LinkAnnot || hitAnnot is BaseWidget)
                         {
                             newCursor = Cursors.Hand;
                         }
-
-                        if ((hitAnnot is BaseWidget))
-                        {
-                            BaseWidget widgetAnnot = (BaseWidget)hitAnnot;
-                            if (widgetAnnot.GetFormType() == C_WIDGET_TYPE.WIDGET_PUSHBUTTON)
-                            {
-                                newCursor = Cursors.Hand;
-                            }
-                        }
                         cursorSet = true;
                     }
                     else