added placeholderFont property to both SurveyTextField and SurveyText…

…View
wess · Jan 14, 2014 · b5d89b7 · b5d89b7
1 parent 81ca698
commit b5d89b7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/Survey/SurveyTextField.h b/Survey/SurveyTextField.h
@@ -119,6 +119,11 @@
  */
 @property (copy, nonatomic) UIColor                     *placeholderColor;
 
+/**
+ Allows for changing font of placeholder text.
+ */
+@property (copy, nonatomic) UIFont                      *placeholderFont;
+
 /**
  The next field in the form's list of fields
  
@@ -138,7 +143,7 @@
  
  @return YES/NO if the field's value is valid.
  */
-- (BOOL) isValid;
+- (BOOL)isValid;
 
 
 /**

diff --git a/Survey/SurveyTextField.m b/Survey/SurveyTextField.m
@@ -131,18 +131,20 @@ - (void)moveToNextField
 - (void)drawPlaceholderInRect:(CGRect)rect
 {
     _placeholderColor = _placeholderColor?:[UIColor colorWithWhite:0.7f alpha:1.0f];
-
+	_placeholderFont = _placeholderFont?:self.font;
+
 	if ([self.placeholder respondsToSelector:@selector(drawInRect:withAttributes:)]) {
 		// iOS 7 and later
-		NSDictionary *attributes = @{NSForegroundColorAttributeName: _placeholderColor, NSFontAttributeName: self.font};
+		NSDictionary *attributes = @{NSForegroundColorAttributeName: _placeholderColor, NSFontAttributeName: _placeholderFont};
 
 		[self.placeholder drawInRect:rect withAttributes:attributes];
 	} else {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 		// iOS 6
 		[_placeholderColor setFill];
-		[self.placeholder drawInRect:rect withFont:self.font lineBreakMode:NSLineBreakByTruncatingTail];
+
+		[self.placeholder drawInRect:rect withFont:_placeholderFont lineBreakMode:NSLineBreakByTruncatingTail];
 #pragma clang diagnostic pop
 	}
 }

diff --git a/Survey/SurveyTextView.h b/Survey/SurveyTextView.h
@@ -116,6 +116,11 @@
  */
 @property (copy, nonatomic) UIColor                     *placeholderColor;
 
+/**
+ Font for placeholder text.
+ */
+@property (copy, nonatomic) UIFont                      *placeholderFont;
+
 /**
  The next field in the form's list of fields
  

diff --git a/Survey/SurveyTextView.m b/Survey/SurveyTextView.m
@@ -147,7 +147,7 @@ - (void)drawRect:(CGRect)rect
             self.placeholderLabel                   = [[UILabel alloc] initWithFrame:CGRectMake(8,8,self.bounds.size.width - 16,0)];
             self.placeholderLabel.lineBreakMode     = NSLineBreakByWordWrapping;
             self.placeholderLabel.numberOfLines     = 0;
-            self.placeholderLabel.font              = self.font;
+            self.placeholderLabel.font              = self.placeholderFont?: self.font;
             self.placeholderLabel.backgroundColor   = [UIColor clearColor];
             self.placeholderLabel.alpha             = 0;