Add prefix to sizeThatFitsBlock

alexdrone · Jun 1, 2015 · d039db9 · d039db9
1 parent 98db3d4
commit d039db9
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 706 deletions.
diff --git a/FlexboxKit.xcodeproj/xcuserdata/alexusbergo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/FlexboxKit.xcodeproj/xcuserdata/alexusbergo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
diff --git a/FlexboxKit.xcodeproj/xcuserdata/alexusbergo.xcuserdatad/xcschemes/FlexboxKit.xcscheme b/FlexboxKit.xcodeproj/xcuserdata/alexusbergo.xcuserdatad/xcschemes/FlexboxKit.xcscheme
diff --git a/FlexboxKit.xcodeproj/xcuserdata/alexusbergo.xcuserdatad/xcschemes/xcschememanagement.plist b/FlexboxKit.xcodeproj/xcuserdata/alexusbergo.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/FlexboxKit/FLEXBOXNode.m b/FlexboxKit/FLEXBOXNode.m
@@ -10,7 +10,7 @@
 
 const CGFloat FLEXBOXUndefinedDimension = CSS_UNDEFINED;
 
-static BOOL FLEXBOX_alwaysDirty(void *context)
+static bool FLEXBOX_alwaysDirty(void *context)
 {
     return YES;
 }

diff --git a/FlexboxKit/UIView+FLEXBOX.h b/FlexboxKit/UIView+FLEXBOX.h
@@ -90,6 +90,6 @@
 
 /// Define this block if you want to specify some custom logic instead of
 /// calling -[UIView sizeThatFits:] in -[UIView flexComputeSize:]
-@property (nonatomic, copy) CGSize (^sizeThatFitsBlock)(CGSize size);
+@property (nonatomic, copy) CGSize (^flexSizeThatFitsBlock)(CGSize size);
 
 @end
diff --git a/FlexboxKit/UIView+FLEXBOX.m b/FlexboxKit/UIView+FLEXBOX.m
@@ -86,12 +86,12 @@ - (void)setFlexFixedSize:(CGSize)flexFixedSize
     return objc_setAssociatedObject(self, &FLEXBOXSizeKey, [NSValue valueWithCGSize:flexFixedSize], OBJC_ASSOCIATION_RETAIN);
 }
 
-- (void)setSizeThatFitsBlock:(CGSize (^)(CGSize))sizeThatFitsBlock
+- (void)setFlexSizeThatFitsBlock:(CGSize (^)(CGSize))sizeThatFitsBlock
 {
     objc_setAssociatedObject(self, &FLEXBOXSizeThatFitsBlock, [sizeThatFitsBlock copy], OBJC_ASSOCIATION_COPY);
 }
 
-- (CGSize (^)(CGSize))sizeThatFitsBlock
+- (CGSize (^)(CGSize))flexSizeThatFitsBlock
 {
     return objc_getAssociatedObject(self, &FLEXBOXSizeThatFitsBlock);
 }
@@ -105,9 +105,9 @@ - (CGSize)flexComputeSize:(CGSize)bounds
     bounds.width = isnan(bounds.width) ? FLT_MAX : bounds.width;
 
     CGSize size = CGSizeZero;
-    
-    if (self.sizeThatFitsBlock != nil) {
-        size = self.sizeThatFitsBlock(bounds);
+
+    if (self.flexSizeThatFitsBlock != nil) {
+        size = self.flexSizeThatFitsBlock(bounds);
     } else {
          size = [self sizeThatFits:bounds];
     }