Parcourir la source

PDFTools - Fixed 17866 【form】字体大小的参数要在对齐方式的下面(目前字体大小在默认值的下面,留意统一改一下)

chenyu il y a 1 an
Parent
commit
887c8c7714

+ 7 - 13
compdfkit-tools/compdfkit-tools/Form/Controller/CPDFFormTextViewController.m

@@ -133,11 +133,9 @@
     self.inputTextView.titleLabel.text = NSLocalizedString(@"Default Value", nil);
     self.inputTextView.delegate = self;
     [self.scrcollView addSubview:self.inputTextView];
-    
-    
+
     self.baseName = @"Helvetica";
     self.fontSettingView.fontNameSelectLabel.text = self.baseName;
-    
     self.textWidget = (CPDFTextWidgetAnnotation*)self.annotManage.annotStyle.annotations.firstObject;
 
 }
@@ -276,10 +274,9 @@
         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, 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)+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, 44);
+        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);
         
     } else {
@@ -289,12 +286,9 @@
         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)+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)+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, 44);
-        
+        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);
     }