PDFTools(iOS) - 高保真UI调整

compdfkit-tools/compdfkit-tools/Common/Views/PDFProperties/CPDFColorSelectView.m

@@ -97,7 +97,7 @@
 - (void)layoutSubviews {
     [super layoutSubviews];
     self.colorLabel.frame = CGRectMake(20, 0, self.bounds.size.width, self.bounds.size.height/3);
-    self.colorPickerView.frame = CGRectMake(8, self.bounds.size.height/3, self.bounds.size.width-16, 60);
+    self.colorPickerView.frame = CGRectMake(20, self.bounds.size.height/3, self.bounds.size.width-40, 60);
     self.colorPickerView.contentSize = CGSizeMake(self.bounds.size.width+100, 60);
     [self pickerBarInit];
 }

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

@@ -262,27 +262,27 @@
     if (@available(iOS 11.0, *)) {
         self.textFiledView.frame = CGRectMake(self.view.safeAreaInsets.left, 8, self.view.frame.size.width - self.view.safeAreaInsets.left, 65);
         self.buttonTextFiledView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.textFiledView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left, 65);
-        self.borderColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.buttonTextFiledView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
-        self.backGroundColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.borderColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
-        self.textColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.backGroundColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
+        self.borderColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.buttonTextFiledView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 74);
+        self.backGroundColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.borderColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 74);
+        self.textColorView.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.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, 90);
+        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, 30);
+        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);
         self.buttonTextFiledView.frame = CGRectMake(0,CGRectGetMaxY(self.textFiledView.frame)+8, self.view.frame.size.width, 60);
-        self.borderColorView.frame = CGRectMake(0,CGRectGetMaxY(self.buttonTextFiledView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
-        self.backGroundColorView.frame = CGRectMake(0,CGRectGetMaxY(self.textFiledView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
-        self.textColorView.frame = CGRectMake(0,CGRectGetMaxY(self.backGroundColorView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
+        self.borderColorView.frame = CGRectMake(0,CGRectGetMaxY(self.buttonTextFiledView.frame)+8, self.view.frame.size.width, 74);
+        self.backGroundColorView.frame = CGRectMake(0,CGRectGetMaxY(self.textFiledView.frame)+8, self.view.frame.size.width, 74);
+        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, ((self.view.frame.size.height)/9)*2);
+        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, 30);
+        self.hideFormView.frame = CGRectMake(0, CGRectGetMaxY(self.sizeThickNessView.frame) + 8, self.view.frame.size.width, 44);
     }
 }
 

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

@@ -192,22 +192,22 @@
     
     if (@available(iOS 11.0, *)) {
         self.formTextFiledView.frame = CGRectMake(self.view.safeAreaInsets.left, 8, self.view.frame.size.width - self.view.safeAreaInsets.left, 65);
-        self.borderColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.formTextFiledView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
-        self.backGroundColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.borderColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
-        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, 90);
-        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, 30);
-        self.selectDefaultSwitchView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.arrowStyleView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left, 30);
-        self.hideFormSwitchView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.selectDefaultSwitchView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left, 30);
+        self.borderColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.formTextFiledView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 74);
+        self.backGroundColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.borderColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 74);
+        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);
 
         
     } 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, ((self.view.frame.size.height)/9)*2);
-        self.backGroundColorView.frame = CGRectMake(0,CGRectGetMaxY(self.borderColorView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
-        self.colorSelectView.frame = CGRectMake(0,CGRectGetMaxY(self.backGroundColorView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
-        self.arrowStyleView.frame = CGRectMake(0,CGRectGetMaxY(self.colorSelectView.frame)+8, self.view.frame.size.width, 30);
-        self.selectDefaultSwitchView.frame = CGRectMake(0, CGRectGetMaxY(self.arrowStyleView.frame)+8, self.view.frame.size.width, 30);
-        self.hideFormSwitchView.frame = CGRectMake(0,  CGRectGetMaxY(self.selectDefaultSwitchView.frame)+8,self.view.frame.size.width , 30);
+        self.borderColorView.frame = CGRectMake(0,CGRectGetMaxY(self.formTextFiledView.frame)+8, self.view.frame.size.width, 74);
+        self.backGroundColorView.frame = CGRectMake(0,CGRectGetMaxY(self.borderColorView.frame)+8, self.view.frame.size.width, 74);
+        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);
     }
     
 }

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

@@ -248,25 +248,25 @@
     
     if (@available(iOS 11.0, *)) {
         self.textFiledView.frame = CGRectMake(self.view.safeAreaInsets.left, 8, self.view.frame.size.width - self.view.safeAreaInsets.left, 65);
-        self.borderColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.textFiledView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
-        self.backGroundColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.borderColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
-        self.textColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.backGroundColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
+        self.borderColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.textFiledView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 74);
+        self.backGroundColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.borderColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 74);
+        self.textColorView.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.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, 90);
+        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, 30);
+        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);
-        self.borderColorView.frame = CGRectMake(0,CGRectGetMaxY(self.textFiledView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
-        self.backGroundColorView.frame = CGRectMake(0,CGRectGetMaxY(self.borderColorView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
-        self.textColorView.frame = CGRectMake(0, CGRectGetMaxY(self.backGroundColorView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
+        self.borderColorView.frame = CGRectMake(0,CGRectGetMaxY(self.textFiledView.frame)+8, self.view.frame.size.width, 74);
+        self.backGroundColorView.frame = CGRectMake(0,CGRectGetMaxY(self.borderColorView.frame)+8, self.view.frame.size.width, 74);
+        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, ((self.view.frame.size.height)/9)*2);
+        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, 30);
+        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

@@ -254,23 +254,23 @@
     
     if (@available(iOS 11.0, *)) {
         self.textFiledView.frame = CGRectMake(self.view.safeAreaInsets.left, 8, self.view.frame.size.width - self.view.safeAreaInsets.left, 65);
-        self.borderColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.textFiledView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
-        self.backGroundColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.borderColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
-        self.textColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.backGroundColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
+        self.borderColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.textFiledView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right,74);
+        self.backGroundColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.borderColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right,74);
+        self.textColorView.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.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, 90);
+        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, 30);
+        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);
-        self.borderColorView.frame = CGRectMake(0,CGRectGetMaxY(self.textFiledView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
-        self.backGroundColorView.frame = CGRectMake(0,CGRectGetMaxY(self.borderColorView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
-        self.textColorView.frame = CGRectMake(0, CGRectGetMaxY(self.backGroundColorView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
+        self.borderColorView.frame = CGRectMake(0,CGRectGetMaxY(self.textFiledView.frame)+8, self.view.frame.size.width, 74);
+        self.backGroundColorView.frame = CGRectMake(0,CGRectGetMaxY(self.borderColorView.frame)+8, self.view.frame.size.width, 74);
+        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, ((self.view.frame.size.height)/9)*2);
-        self.hideFormView.frame = CGRectMake(0, CGRectGetMaxY(self.sizeThickNessView.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);
     }
 }
 

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

@@ -120,14 +120,11 @@
     _buttonWidget = buttonWidget;
     
     self.formTextFiledView.contentField.text = self.buttonWidget.fieldName;
-    CGFloat red, green, blue, alpha;
-    [self.buttonWidget.backgroundColor getRed:&red green:&green blue:&blue alpha:&alpha];
-    self.colorSelectView.selectedColor = self.buttonWidget.color;
-    self.hideFormSwitchView.switcher.on = self.buttonWidget.isHidden;
     
-    [self.buttonWidget.backgroundColor getRed:&red green:&green blue:&blue alpha:&alpha];
-    self.backGroundColorView.selectedColor = [UIColor colorWithRed:red green:green blue:blue alpha:alpha];
     self.borderColorView.selectedColor = self.buttonWidget.borderColor;
+    self.backGroundColorView.selectedColor = self.buttonWidget.backgroundColor;
+    self.colorSelectView.selectedColor = self.buttonWidget.fontColor;
+    self.hideFormSwitchView.switcher.on = self.buttonWidget.isHidden;
     
     if(self.buttonWidget.state == 1)  {
         self.selectDefaultSwitchView.switcher.on = YES;
@@ -193,20 +190,20 @@
     
     if (@available(iOS 11.0, *)) {
         self.formTextFiledView.frame = CGRectMake(self.view.safeAreaInsets.left, 8, self.view.frame.size.width - self.view.safeAreaInsets.left, 65);
-        self.borderColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.formTextFiledView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
-        self.backGroundColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.borderColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
-        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, 90);
-        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, 30);
-        self.selectDefaultSwitchView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.arrowStyleView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left, 30);
-        self.hideFormSwitchView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.selectDefaultSwitchView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left, 30);
+        self.borderColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.formTextFiledView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 74);
+        self.backGroundColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.borderColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 74);
+        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);
     } 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, ((self.view.frame.size.height)/9)*2);
-        self.backGroundColorView.frame = CGRectMake(0,CGRectGetMaxY(self.borderColorView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
-        self.colorSelectView.frame = CGRectMake(0,CGRectGetMaxY(self.backGroundColorView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
-        self.arrowStyleView.frame = CGRectMake(0,CGRectGetMaxY(self.colorSelectView.frame)+8, self.view.frame.size.width, 30);
-        self.selectDefaultSwitchView.frame = CGRectMake(0, CGRectGetMaxY(self.arrowStyleView.frame)+8, self.view.frame.size.width, 30);
-        self.hideFormSwitchView.frame = CGRectMake(0,  CGRectGetMaxY(self.selectDefaultSwitchView.frame)+8,self.view.frame.size.width , 30);
+        self.borderColorView.frame = CGRectMake(0,CGRectGetMaxY(self.formTextFiledView.frame)+8, self.view.frame.size.width, 74);
+        self.backGroundColorView.frame = CGRectMake(0,CGRectGetMaxY(self.borderColorView.frame)+8, self.view.frame.size.width, 74);
+        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);
     }
 }
 

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

@@ -271,31 +271,31 @@
     
     if (@available(iOS 11.0, *)) {
         self.textFiledView.frame = CGRectMake(self.view.safeAreaInsets.left, 8, self.view.frame.size.width - self.view.safeAreaInsets.left, 65);
-        self.borderColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.textFiledView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
-        self.backGroundColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.borderColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
-        self.textColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.backGroundColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
+        self.borderColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.textFiledView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 74);
+        self.backGroundColorView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.borderColorView.frame)+8,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 74);
+        self.textColorView.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.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.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, 30);
+        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.inputTextView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.fontAlignView.frame)+8, self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 120);
-        self.sizeThickNessView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.inputTextView.frame),self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 90);
+        self.sizeThickNessView.frame = CGRectMake(self.view.safeAreaInsets.left, CGRectGetMaxY(self.inputTextView.frame)+8,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, 30);
-        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, 30);
+        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.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);
         
     } else {
         self.textFiledView.frame = CGRectMake(0, 8, self.view.bounds.size.width, 60);
-        self.borderColorView.frame = CGRectMake(0,CGRectGetMaxY(self.textFiledView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
-        self.backGroundColorView.frame = CGRectMake(0, CGRectGetMaxY(self.borderColorView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
-        self.textColorView.frame = CGRectMake(0, CGRectGetMaxY(self.backGroundColorView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
+        self.borderColorView.frame = CGRectMake(0,CGRectGetMaxY(self.textFiledView.frame)+8, self.view.frame.size.width, 74);
+        self.backGroundColorView.frame = CGRectMake(0, CGRectGetMaxY(self.borderColorView.frame)+8, self.view.frame.size.width, 74);
+        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.fontAlignView.frame = CGRectMake(0, CGRectGetMaxY(self.fontSettingView.frame)+10, self.view.frame.size.width, 30);
-        self.inputTextView.frame = CGRectMake(0, CGRectGetMaxY(self.fontAlignView.frame)+10, self.view.frame.size.width, 120);
+        self.fontAlignView.frame = CGRectMake(0, CGRectGetMaxY(self.fontSettingView.frame)+8, self.view.frame.size.width, 48);
+        self.inputTextView.frame = CGRectMake(0, CGRectGetMaxY(self.fontAlignView.frame)+8, self.view.frame.size.width, 120);
         
-        self.sizeThickNessView.frame = CGRectMake(0, CGRectGetMaxY(self.inputTextView.frame), self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
+        self.sizeThickNessView.frame = CGRectMake(0, CGRectGetMaxY(self.inputTextView.frame)+8, self.view.frame.size.width, ((self.view.frame.size.height)/9)*2);
         
-        self.hideFormView.frame = CGRectMake(0, CGRectGetMaxY(self.sizeThickNessView.frame) + 8, self.view.frame.size.width, 30);
+        self.hideFormView.frame = CGRectMake(0, CGRectGetMaxY(self.sizeThickNessView.frame) + 8, self.view.frame.size.width, 44);
         
-        self.multiLineView.frame = CGRectMake(0, CGRectGetMaxY(self.multiLineView.frame) + 8, self.view.frame.size.width, 30);
+        self.multiLineView.frame = CGRectMake(0, CGRectGetMaxY(self.multiLineView.frame) + 8, self.view.frame.size.width, 44);
     }
     
 }

compdfkit-tools/compdfkit-tools/Form/View/CPDFFontAlignView.m

@@ -62,12 +62,12 @@
 - (void)layoutSubviews {
     [super layoutSubviews];
     
-    self.alignmentLabel.frame = CGRectMake(20, 0, 100, 30);
+    self.alignmentLabel.frame = CGRectMake(20, 9, 100, 30);
     
     self.leftAlignBtn.frame = CGRectMake(0, 0, 50, 30);
     self.centerAlignBtn.frame = CGRectMake(50, 0, 50, 30);
     self.rightAlignBtn.frame = CGRectMake(100, 0, 50, 30);
-    self.alignmnetCoverView.frame = CGRectMake(self.frame.size.width - 170, 0, 150, 30);
+    self.alignmnetCoverView.frame = CGRectMake(self.frame.size.width - 170, 9, 150, 30);
 }
 
 

compdfkit-tools/compdfkit-tools/Form/View/CPDFFormArrowStyleView.m

@@ -56,10 +56,10 @@
 - (void)layoutSubviews {
     [super layoutSubviews];
     
-    self.titleLabel.frame = CGRectMake(20, 0, 120, 30);
-    self.arrowCoverView.frame = CGRectMake(self.frame.size.width - 100, 0, 80, 30);
-    self.arrowImageView.frame = CGRectMake(18+10, 7.5, 15, 15);
-    self.arrowDirectionView.frame = CGRectMake(CGRectGetMaxX(self.arrowImageView.frame)+10, 7.5, 15, 15);
+    self.titleLabel.frame = CGRectMake(20, 7, 120, 30);
+    self.arrowCoverView.frame = CGRectMake(self.frame.size.width - 100, 8, 80, 28);
+    self.arrowImageView.frame = CGRectMake(18+10, 6.5, 15, 15);
+    self.arrowDirectionView.frame = CGRectMake(CGRectGetMaxX(self.arrowImageView.frame)+10, 6.5, 15, 15);
     self.selectButton.frame = self.arrowCoverView.bounds;
 }
 

compdfkit-tools/compdfkit-tools/Form/View/CPDFFormSwitchView.m

@@ -29,8 +29,8 @@
 
 - (void)layoutSubviews {
     [super layoutSubviews];
-    self.titleLabel.frame = CGRectMake(20, 5, self.bounds.size.width - 40, 20);
-    self.switcher.frame = CGRectMake(self.bounds.size.width - 70,0, 70, 30);
+    self.titleLabel.frame = CGRectMake(20, 12, self.bounds.size.width - 40, 20);
+    self.switcher.frame = CGRectMake(self.bounds.size.width - 70,7, 70, 30);
 }
 
 - (void)switchAction:(UISwitch*)sender {