bugfix for YYText

zhengxf · Jan 6, 2016 · 94dea55 · 94dea55
1 parent 01495f6
commit 94dea55
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/YYKit/Text/String/NSAttributedString+YYText.m b/YYKit/Text/String/NSAttributedString+YYText.m
@@ -551,20 +551,29 @@ + (NSMutableAttributedString *)attachmentStringWithContent:(id)content
     switch (alignment) {
         case YYTextVerticalAlignmentTop: {
             delegate.ascent = font.ascender;
-            delegate.descent = attachmentSize.height + font.descender;
-            if (delegate.descent < 0) delegate.descent = 0;
+            delegate.descent = attachmentSize.height - font.ascender;
+            if (delegate.descent < 0) {
+                delegate.descent = 0;
+                delegate.ascent = attachmentSize.height;
+            }
         } break;
         case YYTextVerticalAlignmentCenter: {
             CGFloat fontHeight = font.ascender - font.descender;
             CGFloat yOffset = font.ascender - fontHeight * 0.5;
             delegate.ascent = attachmentSize.height * 0.5 + yOffset;
             delegate.descent = attachmentSize.height - delegate.ascent;
-            if (delegate.descent < 0) delegate.descent = 0;
+            if (delegate.descent < 0) {
+                delegate.descent = 0;
+                delegate.ascent = attachmentSize.height;
+            }
         } break;
         case YYTextVerticalAlignmentBottom: {
             delegate.ascent = attachmentSize.height + font.descender;
             delegate.descent = -font.descender;
-            if (delegate.ascent < 0) delegate.ascent = 0;
+            if (delegate.ascent < 0) {
+                delegate.ascent = 0;
+                delegate.descent = attachmentSize.height;
+            }
         } break;
         default: {
             delegate.ascent = attachmentSize.height;