Merge remote-tracking branch 'origin/master'

hackiftekhar · Jul 27, 2017 · 023df5e · 023df5e
2 parents 7a740a3 + 8dfd2d6
commit 023df5e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/IQKeyboardManagerSwift/IQTextView/IQTextView.swift b/IQKeyboardManagerSwift/IQTextView/IQTextView.swift
@@ -85,7 +85,15 @@ open class IQTextView : UITextView {
 
         if let unwrappedPlaceholderLabel = placeholderLabel {
             unwrappedPlaceholderLabel.sizeToFit()
-            unwrappedPlaceholderLabel.frame = CGRect(x: 4, y: 8, width: self.frame.width-16, height: unwrappedPlaceholderLabel.frame.height)
+            let offsetXLeft = textContainerInset.left + textContainer.lineFragmentPadding
+            let offsetXRight = textContainerInset.right
+            let offsetY = textContainerInset.top
+            unwrappedPlaceholderLabel.frame = CGRect(
+                x: offsetXLeft,
+                y: offsetY,
+                width: self.frame.width - offsetXLeft - offsetXRight,
+                height: unwrappedPlaceholderLabel.frame.height
+            )
         }
     }
 

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Often while developing an app, We ran into an issues where the iPhone keyboard s
 [![Issue Stats](http://issuestats.com/github/hackiftekhar/iqkeyboardmanager/badge/pr?style=flat)](http://issuestats.com/github/hackiftekhar/iqkeyboardmanager)
 [![Issue Stats](http://issuestats.com/github/hackiftekhar/iqkeyboardmanager/badge/issue?style=flat)](http://issuestats.com/github/hackiftekhar/iqkeyboardmanager)
 
-1) `**CODELESS**, Zero Line Of Code`
+1) `**CODELESS**, Zero Lines Of Code`
 
 2) `Works Automatically`