Fix textPadding for left & right views

Author: stephsharp

MaterialTextField/MFTextField.m

@@ -642,9 +642,16 @@ - (void)removeErrorLabel
 - (CGRect)textRectForBounds:(CGRect)bounds
 {
     CGRect superRect = [super textRectForBounds:bounds];
-    CGRect rect = CGRectMake(superRect.origin.x + self.textPadding.width,
+    CGRect rightRect = [super rightViewRectForBounds:bounds];
+    BOOL hasLeftView = [self leftViewRectForBounds:bounds].size.width > 0;
+    BOOL hasRightView = [self rightViewRectForBounds:bounds].size.width > 0;
+    
+    CGFloat leftPadding = hasLeftView ? 0 : self.textPadding.width;
+    CGFloat rightPadding = hasRightView ? rightRect.size.width : self.textPadding.width * 2;
+    
+    CGRect rect = CGRectMake(superRect.origin.x + leftPadding,
                              [self adjustedYPositionForTextRect],
-                             superRect.size.width - (2.0 * self.textPadding.width),
+                             superRect.size.width - rightPadding,
                              self.font.lineHeight);
     self.textRect = rect;
     return rect;
@@ -680,6 +687,7 @@ - (CGRect)clearButtonRectForBounds:(CGRect)bounds
 - (CGRect)rightViewRectForBounds:(CGRect)bounds
 {
     CGRect rightViewRect = [super rightViewRectForBounds:bounds];
+    rightViewRect.origin.x = rightViewRect.origin.x - self.textPadding.width;
     rightViewRect.origin.y = CGRectGetMidY(_textRect) - (rightViewRect.size.height / 2.0f);
 
     return rightViewRect;
@@ -688,6 +696,7 @@ - (CGRect)rightViewRectForBounds:(CGRect)bounds
 - (CGRect)leftViewRectForBounds:(CGRect)bounds
 {
     CGRect leftViewRect = [super leftViewRectForBounds:bounds];
+    leftViewRect.origin.x = self.textPadding.width;
     leftViewRect.origin.y = CGRectGetMidY(_textRect) - (leftViewRect.size.height / 2.0f);
 
     return leftViewRect;

MaterialTextFieldDemo/MaterialTextFieldDemo/Base.lproj/Main.storyboard

@@ -73,7 +73,7 @@
                                     <outlet property="delegate" destination="BYZ-38-t0r" id="0u6-qT-cZ2"/>
                                 </connections>
                             </textField>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="placeholder" adjustsFontSizeToFit="NO" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Z0L-Ka-jzP" customClass="MFTextField">
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="placeholder" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Z0L-Ka-jzP" customClass="MFTextField">
                                 <rect key="frame" x="16" y="272.5" width="343" height="40"/>
                                 <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>