Respect InterfaceBuilder paragraphStyle if not changed.

r-plus · Jul 5, 2016 · 680cf07 · 680cf07
1 parent b3b83cf
commit 680cf07
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Source/AttributedString.swift b/Source/AttributedString.swift
@@ -44,7 +44,7 @@ extension NSAttributedString {
      - returns: The newly created NSAttributedString.
      */
     public convenience init(string: String, attributes: TextAttributes) {
-        self.init(string: string, attributes: attributes.dictionary)
+        self.init(string: string, attributes: attributes.attributes)
     }
 }
 
@@ -75,7 +75,7 @@ extension NSMutableAttributedString {
      - parameter range:      The range of characters whose attributes are set.
      */
     public func setAttributes(attributes: TextAttributes, range: NSRange) {
-        setAttributes(attributes.dictionary, range: range)
+        setAttributes(attributes.attributes, range: range)
     }
 
     /**
@@ -104,6 +104,6 @@ extension NSMutableAttributedString {
      - parameter range:      he range of characters to which the specified attributes apply.
      */
     public func addAttributes(attributes: TextAttributes, range: NSRange) {
-        addAttributes(attributes.dictionary, range: range)
+        addAttributes(attributes.attributes, range: range)
     }
 }
diff --git a/Source/TextAttributes.swift b/Source/TextAttributes.swift
@@ -101,6 +101,15 @@ public class TextAttributes {
         return clone
     }
 
+    /// InterfaceBuilder paragraph settings respected attributes dictionary.
+    var attributes: [String: AnyObject] {
+        var attributes = dictionary
+        if paragraphStyle == NSParagraphStyle() {
+            attributes[NSParagraphStyleAttributeName] = nil
+        }
+        return attributes
+    }
+
     // MARK: - Font
 
     /// The font attribute.
@@ -1164,4 +1173,4 @@ public class TextAttributes {
             return self
         }
     }
-#endif
+#endif