compdfkit-tools/compdfkit-tools/Common/Views/PDFView/PDFListView/CPDFListView+Form.m

@@ -385,6 +385,7 @@
             isPushButton = YES;
             widgetAnnotation = [[CPDFButtonWidgetAnnotation alloc] initWithDocument:self.document controlType:CPDFWidgetPushButtonControl];
             CPDFButtonWidgetAnnotation *buttonWidgetAnnotationut = widgetAnnotation;
+            widgetAnnotation.borderColor = [UIColor blackColor];
             buttonWidgetAnnotationut.caption = @"Push Button";
             [widgetAnnotation setFieldName:[NSString stringWithFormat:@"%@%@",@"Push Button_",[self tagString]]];
         }

compdfkit-tools/compdfkit-tools/Form/Controller/CPDFFormButtonViewController.m

@@ -109,13 +109,13 @@
     self.buttonTextFiledView.delegate = self;
     [self.scrcollView addSubview:self.buttonTextFiledView];
     
-    self.hideFormView = [[CPDFFormSwitchView alloc] init];
-    self.hideFormView.delegate = self;
-    self.hideFormView.titleLabel.font = [UIFont boldSystemFontOfSize:13.0];
-    self.hideFormView.titleLabel.textColor = [UIColor colorWithRed:153/255. green:153/255. blue:153/255. alpha:1];
-    self.hideFormView.titleLabel.text = NSLocalizedString(@"Hide The Field", nil);
-    [self.scrcollView addSubview:self.hideFormView];
-    self.hideFormView.delegate = self;
+//    self.hideFormView = [[CPDFFormSwitchView alloc] init];
+//    self.hideFormView.delegate = self;
+//    self.hideFormView.titleLabel.font = [UIFont boldSystemFontOfSize:13.0];
+//    self.hideFormView.titleLabel.textColor = [UIColor colorWithRed:153/255. green:153/255. blue:153/255. alpha:1];
+//    self.hideFormView.titleLabel.text = NSLocalizedString(@"Hide The Field", nil);
+//    [self.scrcollView addSubview:self.hideFormView];
+//    self.hideFormView.delegate = self;
     
     self.fontSettingView = [[CPDFFontSettingView alloc] init];
     self.fontSettingView.fontNameLabel.font = [UIFont boldSystemFontOfSize:13.0];
@@ -140,11 +140,19 @@
     self.buttonTextFiledView.contentField.text = self.buttonWidget.caption;
     
     //border color
-    self.borderColorView.selectedColor = self.buttonWidget.borderColor;
     self.backGroundColorView.selectedColor = self.buttonWidget.backgroundColor;
-    //Text color
+    
+    if(self.buttonWidget.borderColor == nil) {
+        self.borderColorView.selectedColor = [UIColor blackColor];
+        [self refreshUI];
+    }else{
+        self.borderColorView.selectedColor = self.buttonWidget.borderColor;
+    }
+    
     if(self.buttonWidget.fontColor == nil) {
         self.textColorView.selectedColor = [UIColor blackColor];
+        self.buttonWidget.fontColor = [UIColor blackColor];
+        [self refreshUI];
     }else{
         self.textColorView.selectedColor = self.buttonWidget.fontColor;
     }
@@ -275,7 +283,7 @@
     
         self.sizeThickNessView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.fontSettingView.frame),self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 82);
         
-        self.hideFormView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.sizeThickNessView.frame) + 8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 44);
+//        self.hideFormView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.sizeThickNessView.frame) + 8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 44);
         
     } else {
         self.textFiledView.frame = CGRectMake(0, 8, self.view.bounds.size.width, 60);
@@ -287,7 +295,7 @@
         
         self.sizeThickNessView.frame = CGRectMake(0, CGRectGetMaxY(self.fontSettingView.frame), self.view.frame.size.width, 82);
         
-        self.hideFormView.frame = CGRectMake(0, CGRectGetMaxY(self.sizeThickNessView.frame) + 8, self.view.frame.size.width, 44);
+//        self.hideFormView.frame = CGRectMake(0, CGRectGetMaxY(self.sizeThickNessView.frame) + 8, self.view.frame.size.width, 44);
     }
 }
 

compdfkit-tools/compdfkit-tools/Form/Controller/CPDFFormCheckBoxViewController.m

@@ -97,13 +97,13 @@
     self.selectDefaultSwitchView.titleLabel.text = NSLocalizedString(@"Button is Checked by default", nil);
     self.selectDefaultSwitchView.delegate = self;
     
-    self.hideFormSwitchView = [[CPDFFormSwitchView alloc] init];
-    [self.scrcollView addSubview:self.hideFormSwitchView];
+//    self.hideFormSwitchView = [[CPDFFormSwitchView alloc] init];
+//    [self.scrcollView addSubview:self.hideFormSwitchView];
     
-    self.hideFormSwitchView.titleLabel.font = [UIFont boldSystemFontOfSize:13.0];
-    self.hideFormSwitchView.titleLabel.textColor = [UIColor colorWithRed:153/255. green:153/255. blue:153/255. alpha:1];
-    self.hideFormSwitchView.titleLabel.text = NSLocalizedString(@"Hide The Field", nil);
-    self.hideFormSwitchView.delegate = self;
+//    self.hideFormSwitchView.titleLabel.font = [UIFont boldSystemFontOfSize:13.0];
+//    self.hideFormSwitchView.titleLabel.textColor = [UIColor colorWithRed:153/255. green:153/255. blue:153/255. alpha:1];
+//    self.hideFormSwitchView.titleLabel.text = NSLocalizedString(@"Hide The Field", nil);
+//    self.hideFormSwitchView.delegate = self;
     
     self.arrowStyleView = [[CPDFFormArrowStyleView alloc] init];
     [self.scrcollView addSubview:self.arrowStyleView];
@@ -208,7 +208,7 @@
         self.colorSelectView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.backGroundColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 74);
         self.arrowStyleView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.colorSelectView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 44);
         self.selectDefaultSwitchView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.arrowStyleView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left, 44);
-        self.hideFormSwitchView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.selectDefaultSwitchView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left, 44);
+//        self.hideFormSwitchView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.selectDefaultSwitchView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left, 44);
 
         
     } else {
@@ -218,7 +218,7 @@
         self.colorSelectView.frame = CGRectMake(0,CGRectGetMaxY(self.backGroundColorView.frame)+8, self.view.frame.size.width, 74);
         self.arrowStyleView.frame = CGRectMake(0,CGRectGetMaxY(self.colorSelectView.frame)+8, self.view.frame.size.width, 44);
         self.selectDefaultSwitchView.frame = CGRectMake(0, CGRectGetMaxY(self.arrowStyleView.frame)+8, self.view.frame.size.width, 44);
-        self.hideFormSwitchView.frame = CGRectMake(0,  CGRectGetMaxY(self.selectDefaultSwitchView.frame)+8,self.view.frame.size.width , 44);
+//        self.hideFormSwitchView.frame = CGRectMake(0,  CGRectGetMaxY(self.selectDefaultSwitchView.frame)+8,self.view.frame.size.width , 44);
     }
     
 }

compdfkit-tools/compdfkit-tools/Form/Controller/CPDFFormComboxViewController.m

@@ -101,12 +101,12 @@
     self.textFiledView.delegate = self;
     [self.scrcollView addSubview:self.textFiledView];
     
-    self.hideFormView = [[CPDFFormSwitchView alloc] init];
-    self.hideFormView.delegate = self;
-    self.hideFormView.titleLabel.font = [UIFont boldSystemFontOfSize:13.0];
-    self.hideFormView.titleLabel.textColor = [UIColor colorWithRed:153/255. green:153/255. blue:153/255. alpha:1];
-    self.hideFormView.titleLabel.text = NSLocalizedString(@"Hide The Field", nil);
-    [self.scrcollView addSubview:self.hideFormView];
+//    self.hideFormView = [[CPDFFormSwitchView alloc] init];
+//    self.hideFormView.delegate = self;
+//    self.hideFormView.titleLabel.font = [UIFont boldSystemFontOfSize:13.0];
+//    self.hideFormView.titleLabel.textColor = [UIColor colorWithRed:153/255. green:153/255. blue:153/255. alpha:1];
+//    self.hideFormView.titleLabel.text = NSLocalizedString(@"Hide The Field", nil);
+//    [self.scrcollView addSubview:self.hideFormView];
     
     self.fontSettingView = [[CPDFFontSettingView alloc] init];
     self.fontSettingView.fontNameLabel.font = [UIFont boldSystemFontOfSize:13.0];
@@ -252,7 +252,7 @@
     
         self.sizeThickNessView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.fontSettingView.frame),self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 82);
         
-        self.hideFormView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.sizeThickNessView.frame) + 8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 44);
+//        self.hideFormView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.sizeThickNessView.frame) + 8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 44);
         
     } else {
         self.textFiledView.frame = CGRectMake(0, 8, self.view.bounds.size.width, 60);
@@ -263,7 +263,7 @@
         
         self.sizeThickNessView.frame = CGRectMake(0, CGRectGetMaxY(self.fontSettingView.frame), self.view.frame.size.width, 82);
         
-        self.hideFormView.frame = CGRectMake(0, CGRectGetMaxY(self.sizeThickNessView.frame) + 8, self.view.frame.size.width, 44);
+//        self.hideFormView.frame = CGRectMake(0, CGRectGetMaxY(self.sizeThickNessView.frame) + 8, self.view.frame.size.width, 44);
     }
     
     self.textFiledView.contentField.text = self.comboxChoiceWidget.fieldName;

compdfkit-tools/compdfkit-tools/Form/Controller/CPDFFormListViewController.m

@@ -101,12 +101,12 @@
     self.textFiledView.delegate = self;
     [self.scrcollView addSubview:self.textFiledView];
     
-    self.hideFormView = [[CPDFFormSwitchView alloc] init];
-    self.hideFormView.delegate = self;
-    self.hideFormView.titleLabel.font = [UIFont boldSystemFontOfSize:13.0];
-    self.hideFormView.titleLabel.textColor = [UIColor colorWithRed:153/255. green:153/255. blue:153/255. alpha:1];
-    self.hideFormView.titleLabel.text = NSLocalizedString(@"Hide The Field", nil);
-    [self.scrcollView addSubview:self.hideFormView];
+//    self.hideFormView = [[CPDFFormSwitchView alloc] init];
+//    self.hideFormView.delegate = self;
+//    self.hideFormView.titleLabel.font = [UIFont boldSystemFontOfSize:13.0];
+//    self.hideFormView.titleLabel.textColor = [UIColor colorWithRed:153/255. green:153/255. blue:153/255. alpha:1];
+//    self.hideFormView.titleLabel.text = NSLocalizedString(@"Hide The Field", nil);
+//    [self.scrcollView addSubview:self.hideFormView];
     
     self.fontSettingView = [[CPDFFontSettingView alloc] init];
     self.fontSettingView.fontNameLabel.font = [UIFont boldSystemFontOfSize:13.0];
@@ -260,8 +260,8 @@
         self.fontSettingView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.textColorView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 30);
     
         self.sizeThickNessView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.fontSettingView.frame),self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 82);
-        
-        self.hideFormView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.sizeThickNessView.frame) + 8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 44);
+//        
+//        self.hideFormView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.sizeThickNessView.frame) + 8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 44);
         
     } else {
         self.textFiledView.frame = CGRectMake(0, 8, self.view.bounds.size.width, 60);
@@ -270,7 +270,7 @@
         self.textColorView.frame = CGRectMake(0, CGRectGetMaxY(self.backGroundColorView.frame)+8, self.view.frame.size.width, 74);
         self.fontSettingView.frame = CGRectMake(0, CGRectGetMaxY(self.textColorView.frame)+8, self.view.frame.size.width, 30);
         self.sizeThickNessView.frame = CGRectMake(0, CGRectGetMaxY(self.fontSettingView.frame), self.view.frame.size.width, 82);
-        self.hideFormView.frame = CGRectMake(0, CGRectGetMaxY(self.sizeThickNessView.frame) + 8, self.view.frame.size.width, 44);
+//        self.hideFormView.frame = CGRectMake(0, CGRectGetMaxY(self.sizeThickNessView.frame) + 8, self.view.frame.size.width, 44);
     }
 }
 

compdfkit-tools/compdfkit-tools/Form/Controller/CPDFFormRadioButtonViewController.m

@@ -96,13 +96,13 @@
     self.selectDefaultSwitchView.titleLabel.text = NSLocalizedString(@"Button is Checked by default", nil);
     self.selectDefaultSwitchView.delegate = self;
     
-    self.hideFormSwitchView = [[CPDFFormSwitchView alloc] init];
-    [self.scrcollView addSubview:self.hideFormSwitchView];
-    
-    self.hideFormSwitchView.titleLabel.font = [UIFont boldSystemFontOfSize:13.0];
-    self.hideFormSwitchView.titleLabel.textColor = [UIColor colorWithRed:153/255. green:153/255. blue:153/255. alpha:1];
-    self.hideFormSwitchView.titleLabel.text = NSLocalizedString(@"Hide The Field", nil);
-    self.hideFormSwitchView.delegate = self;
+//    self.hideFormSwitchView = [[CPDFFormSwitchView alloc] init];
+//    [self.scrcollView addSubview:self.hideFormSwitchView];
+//    
+//    self.hideFormSwitchView.titleLabel.font = [UIFont boldSystemFontOfSize:13.0];
+//    self.hideFormSwitchView.titleLabel.textColor = [UIColor colorWithRed:153/255. green:153/255. blue:153/255. alpha:1];
+//    self.hideFormSwitchView.titleLabel.text = NSLocalizedString(@"Hide The Field", nil);
+//    self.hideFormSwitchView.delegate = self;
     
     self.arrowStyleView = [[CPDFFormArrowStyleView alloc] init];
     [self.scrcollView addSubview:self.arrowStyleView];
@@ -214,7 +214,7 @@
         self.colorSelectView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.backGroundColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 74);
         self.arrowStyleView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.colorSelectView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 44);
         self.selectDefaultSwitchView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.arrowStyleView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left, 44);
-        self.hideFormSwitchView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.selectDefaultSwitchView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left, 44);
+//        self.hideFormSwitchView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.selectDefaultSwitchView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left, 44);
     } else {
         self.formTextFiledView.frame = CGRectMake(0, 8, self.view.bounds.size.width, 60);
         self.borderColorView.frame = CGRectMake(0,CGRectGetMaxY(self.formTextFiledView.frame)+8, self.view.frame.size.width, 74);
@@ -222,7 +222,7 @@
         self.colorSelectView.frame = CGRectMake(0,CGRectGetMaxY(self.backGroundColorView.frame)+8, self.view.frame.size.width, 74);
         self.arrowStyleView.frame = CGRectMake(0,CGRectGetMaxY(self.colorSelectView.frame)+8, self.view.frame.size.width, 44);
         self.selectDefaultSwitchView.frame = CGRectMake(0, CGRectGetMaxY(self.arrowStyleView.frame)+8, self.view.frame.size.width, 44);
-        self.hideFormSwitchView.frame = CGRectMake(0,  CGRectGetMaxY(self.selectDefaultSwitchView.frame)+8,self.view.frame.size.width , 44);
+//        self.hideFormSwitchView.frame = CGRectMake(0,  CGRectGetMaxY(self.selectDefaultSwitchView.frame)+8,self.view.frame.size.width , 44);
     }
 }
 

compdfkit-tools/compdfkit-tools/Form/Controller/CPDFFormTextViewController.m

@@ -102,12 +102,12 @@
     self.textFiledView.delegate = self;
     [self.scrcollView addSubview:self.textFiledView];
     
-    self.hideFormView = [[CPDFFormSwitchView alloc] init];
-    self.hideFormView.delegate = self;
-    self.hideFormView.titleLabel.font = [UIFont boldSystemFontOfSize:13.0];
-    self.hideFormView.titleLabel.textColor = [UIColor colorWithRed:153/255. green:153/255. blue:153/255. alpha:1];
-    self.hideFormView.titleLabel.text = NSLocalizedString(@"Hide The Field", nil);
-    [self.scrcollView addSubview:self.hideFormView];
+//    self.hideFormView = [[CPDFFormSwitchView alloc] init];
+//    self.hideFormView.delegate = self;
+//    self.hideFormView.titleLabel.font = [UIFont boldSystemFontOfSize:13.0];
+//    self.hideFormView.titleLabel.textColor = [UIColor colorWithRed:153/255. green:153/255. blue:153/255. alpha:1];
+//    self.hideFormView.titleLabel.text = NSLocalizedString(@"Hide The Field", nil);
+//    [self.scrcollView addSubview:self.hideFormView];
     
     self.multiLineView = [[CPDFFormSwitchView alloc] init];
     self.multiLineView.delegate = self;
@@ -258,13 +258,13 @@
 }
 
 - (void)updatePreferredContentSizeWithTraitCollection:(UITraitCollection *)traitCollection {
-    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width, traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact ? 350 : 660);
+    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width, traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact ? 310 : 620);
 }
 
 - (void)viewWillLayoutSubviews {
     [super viewWillLayoutSubviews];
     self.scrcollView.frame = CGRectMake(0, 60, self.view.frame.size.width, self.view.frame.size.height-60);
-    self.scrcollView.contentSize = CGSizeMake(self.view.frame.size.width, 820);
+    self.scrcollView.contentSize = CGSizeMake(self.view.frame.size.width, 680);
     self.scrcollView.showsVerticalScrollIndicator = NO;
     
     
@@ -277,8 +277,8 @@
         self.fontAlignView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.fontSettingView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 48);
         self.sizeThickNessView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.fontAlignView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 82);
         self.inputTextView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.sizeThickNessView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 120);
-        self.hideFormView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.inputTextView.frame) + 8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 44);
-        self.multiLineView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.hideFormView.frame) + 8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 44);
+//        self.hideFormView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.inputTextView.frame) + 8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 44);
+        self.multiLineView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.inputTextView.frame) + 8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 44);
         
     } else {
         self.textFiledView.frame = CGRectMake(0, 8, self.view.bounds.size.width, 60);
@@ -289,8 +289,8 @@
         self.fontAlignView.frame = CGRectMake(0, CGRectGetMaxY(self.fontSettingView.frame)+8, self.view.frame.size.width, 48);
         self.sizeThickNessView.frame = CGRectMake(0, CGRectGetMaxY(self.fontAlignView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
         self.inputTextView.frame = CGRectMake(0, CGRectGetMaxY(self.sizeThickNessView.frame)+8, self.view.frame.size.width, 120);
-        self.hideFormView.frame = CGRectMake(0, CGRectGetMaxY(self.inputTextView.frame) + 8, self.view.frame.size.width, 44);
-        self.multiLineView.frame = CGRectMake(0, CGRectGetMaxY(self.multiLineView.frame) + 8, self.view.frame.size.width, 44);
+//        self.hideFormView.frame = CGRectMake(0, CGRectGetMaxY(self.inputTextView.frame) + 8, self.view.frame.size.width, 44);
+        self.multiLineView.frame = CGRectMake(0, CGRectGetMaxY(self.inputTextView.frame) + 8, self.view.frame.size.width, 44);
     }
     
 }