Browse Source

Merge remote-tracking branch 'ibireme/master'

MangoFang 9 years ago
parent
commit
ab251a3993

+ 1 - 1
YYText/Component/YYTextEffectWindow.m

@@ -38,7 +38,7 @@
 }
 }
 
 
 - (UIViewController *)rootViewController {
 - (UIViewController *)rootViewController {
-    for (UIWindow *window in [[UIApplication sharedApplication] windows]) {
+    for (UIWindow *window in [YYTextSharedApplication() windows]) {
         if (self == window) continue;
         if (self == window) continue;
         if (window.hidden) continue;
         if (window.hidden) continue;
         UIViewController *topViewController = window.rootViewController;
         UIViewController *topViewController = window.rootViewController;

+ 1 - 1
YYText/Utility/NSAttributedString+YYText.h

@@ -612,7 +612,7 @@
  @since YYText:6.0
  @since YYText:6.0
  */
  */
 + (NSMutableAttributedString *)yy_attachmentStringWithContent:(id)content
 + (NSMutableAttributedString *)yy_attachmentStringWithContent:(id)content
-                                                    contentMode:(UIViewContentMode)contentMode
+                                                  contentMode:(UIViewContentMode)contentMode
                                                         width:(CGFloat)width
                                                         width:(CGFloat)width
                                                        ascent:(CGFloat)ascent
                                                        ascent:(CGFloat)ascent
                                                       descent:(CGFloat)descent;
                                                       descent:(CGFloat)descent;