Release V1.4.0 Fix bug #42

Author: youngsoft

CHANGELOG.md

@@ -3,6 +3,21 @@
 
 ---
 
+## [V1.4.0](https://github.com/youngsoft/MyLinearLayout/releases/tag/1.4.0)(2017/6/16)
+
+#### Added
+1. 添加了布局视图的新属性：`selected`,这个属性用来记录布局视图的选中和未选中状态
+2. 添加了布局视图删除所有子视图的快捷方法：`removeAllSubviews`。
+
+
+#### Fixed
+1. 修复子视图宽高铺满布局视图并设置背景色时边界线不显示的问题。
+2. 修复了浮动布局`MyFloatLayout`中当子视图同时设置了`clearFloat`和`weight`的时候有可能尺寸显示不正确的问题。修复了[#BUG42](https://github.com/youngsoft/MyLinearLayout/issues/42)
+3. 修复了线性布局`MyLinearLayout`和框架布局`MyFrameLayout`同时设置左右或者上下边距和居中时的尺寸不正确的问题。
+4. 优化了位置和尺寸计算时的精度问题，老版本中有可能会出现比如12.99999999999998的场景，新版本将会减少这种情况的发生而直接设置为13. 同时对所有的布局中的大小比较进行了精度限制的优化。
+
+
+
 ## [V1.3.9](https://github.com/youngsoft/MyLinearLayout/releases/tag/1.3.9)(2017/6/12)
 
 #### Fixed

MyLayout.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "MyLayout"
-  s.version      = "1.3.9"
+  s.version      = "1.4.0"
   s.summary      = "MyLayout is an iOS UI framework integrates the functions with Android,AutoLayout,SizeClass,HTML CSS float and flexbox,UIView UITableView."
 
   s.description  = <<-DESC
@@ -75,7 +75,7 @@ Pod::Spec.new do |s|
   #  Supports git, hg, bzr, svn and HTTP.
   #
 
-  s.source       = { :git => "https://github.com/youngsoft/MyLinearLayout.git", :tag => "1.3.9" }
+  s.source       = { :git => "https://github.com/youngsoft/MyLinearLayout.git", :tag => "1.4.0" }
 
 
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

MyLayout/Lib/MyBaseLayout.h

@@ -862,6 +862,11 @@ typedef MyBorderline MyBorderLineDraw MYMETHODDEPRECATED("use MyBorderline to in
 @property(nonatomic, assign) BOOL priorAutoresizingMask;
 
 
+/**
+ *设置是否选中状态。您可以用这个状态来记录布局的扩展属性。
+ */
+@property(nonatomic,getter=isSelected) BOOL selected;                                // default is NO may be used by some subclasses or by application
+
 
 
 /**
@@ -874,6 +879,14 @@ typedef MyBorderline MyBorderLineDraw MYMETHODDEPRECATED("use MyBorderline to in
 @property(nonatomic,copy) void (^endLayoutBlock)();
 
 
+
+
+/**
+ 删除所有子视图的方便方法
+ */
+-(void)removeAllSubviews;
+
+
 /**
  *设置布局时的动画。并指定时间。这个函数是下面方法的简单实现：
  

MyLayout/Lib/MyBaseLayout.m

@@ -415,7 +415,7 @@ -(void)setViewLayoutCompleteBlock:(void (^)(MyBaseLayout *, UIView *))viewLayout
 -(CGRect)estimatedRect
 {
     CGRect rect = self.myFrame.frame;
-    if (rect.size.width == CGFLOAT_MAX || rect.size.width == CGFLOAT_MAX)
+    if (rect.size.width == CGFLOAT_MAX || rect.size.height == CGFLOAT_MAX)
         return self.frame;
     return rect;
 }
@@ -1087,6 +1087,11 @@ -(BOOL)hideSubviewReLayout
     return NO;
 }
 
+-(void)removeAllSubviews
+{
+    [self.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)];
+}
+
 
 -(void)layoutAnimationWithDuration:(NSTimeInterval)duration
 {
@@ -2086,13 +2091,13 @@ -(MyGravity)myGetSubviewVertGravity:(UIView*)sbv sbvsc:(UIView*)sbvsc vertGravit
             sbvVertGravity = sbvVertAligement;
         }
 
-        if (sbvsc.centerYPosInner.posVal != nil)
+        if (sbvsc.topPosInner.posVal != nil && sbvsc.bottomPosInner.posVal != nil)
         {
-            sbvVertGravity = MyGravity_Vert_Center;
+            sbvVertGravity = MyGravity_Vert_Fill;
         }
-        else if (sbvsc.topPosInner.posVal != nil && sbvsc.bottomPosInner.posVal != nil)
+        else if (sbvsc.centerYPosInner.posVal != nil)
         {
-            sbvVertGravity = MyGravity_Vert_Fill;
+            sbvVertGravity = MyGravity_Vert_Center;
         }
         else if (sbvsc.topPosInner.posVal != nil)
         {
@@ -2180,13 +2185,13 @@ -(MyGravity)myGetSubviewHorzGravity:(UIView*)sbv sbvsc:(UIView*)sbvsc horzGravit
             sbvHorzGravity = sbvHorzAligement;
         }
 
-        if (sbvsc.centerXPosInner.posVal != nil)
+        if (sbvsc.leadingPosInner.posVal != nil && sbvsc.trailingPosInner.posVal != nil)
         {
-            sbvHorzGravity = MyGravity_Horz_Center;
+            sbvHorzGravity = MyGravity_Horz_Fill;
         }
-        else if (sbvsc.leadingPosInner.posVal != nil && sbvsc.trailingPosInner.posVal != nil)
+        else if (sbvsc.centerXPosInner.posVal != nil)
         {
-            sbvHorzGravity = MyGravity_Horz_Fill;
+            sbvHorzGravity = MyGravity_Horz_Center;
         }
         else if (sbvsc.leadingPosInner.posVal != nil)
         {
@@ -3210,7 +3215,7 @@ -(void)setTopBorderline:(MyBorderline *)topBorderline
         _topBorderline = topBorderline;
 
         CAShapeLayer *borderLayer = _topBorderlineLayer;
-        [self myUpdateBorderLayer:&borderLayer withBorderline:_topBorderline];
+        [self updateBorderLayer:&borderLayer withBorderline:_topBorderline];
         _topBorderlineLayer = borderLayer;
 
     }
@@ -3223,7 +3228,7 @@ -(void)setLeadingBorderline:(MyBorderline *)leadingBorderline
         _leadingBorderline = leadingBorderline;
 
         CAShapeLayer *borderLayer = _leadingBorderlineLayer;
-        [self myUpdateBorderLayer:&borderLayer withBorderline:_leadingBorderline];
+        [self updateBorderLayer:&borderLayer withBorderline:_leadingBorderline];
         _leadingBorderlineLayer = borderLayer;
     }
 }
@@ -3235,7 +3240,7 @@ -(void)setBottomBorderline:(MyBorderline *)bottomBorderline
         _bottomBorderline = bottomBorderline;
 
         CAShapeLayer *borderLayer = _bottomBorderlineLayer;
-        [self myUpdateBorderLayer:&borderLayer withBorderline:_bottomBorderline];
+        [self updateBorderLayer:&borderLayer withBorderline:_bottomBorderline];
         _bottomBorderlineLayer = borderLayer;
     }
 }
@@ -3248,7 +3253,7 @@ -(void)setTrailingBorderline:(MyBorderline *)trailingBorderline
         _trailingBorderline = trailingBorderline;
 
         CAShapeLayer *borderLayer = _trailingBorderlineLayer;
-        [self myUpdateBorderLayer:&borderLayer withBorderline:_trailingBorderline];
+        [self updateBorderLayer:&borderLayer withBorderline:_trailingBorderline];
         _trailingBorderlineLayer = borderLayer;
     }
 
@@ -3289,7 +3294,7 @@ -(void)setRightBorderline:(MyBorderline *)rightBorderline
 
 
 
--(void)myUpdateBorderLayer:(CAShapeLayer**)ppLayer withBorderline:(MyBorderline*)borderline
+-(void)updateBorderLayer:(CAShapeLayer**)ppLayer withBorderline:(MyBorderline*)borderline
 {
 
     if (borderline == nil)
@@ -3526,6 +3531,24 @@ BOOL _myCGFloatNotEqual(CGFloat f1, CGFloat f2)
 #endif
 }
 
+BOOL _myCGFloatLess(CGFloat f1, CGFloat f2)
+{
+#if CGFLOAT_IS_DOUBLE == 1
+    return f2 - f1 > 1e-7;
+#else
+    return f2 - f1 > 1e-4;
+#endif
+
+}
+
+BOOL _myCGFloatGreat(CGFloat f1, CGFloat f2)
+{
+#if CGFLOAT_IS_DOUBLE == 1
+    return f1 - f2 > 1e-7;
+#else
+    return f1 - f2 > 1e-4;
+#endif
+}
 
 BOOL _myCGFloatLessOrEqual(CGFloat f1, CGFloat f2)
 {
@@ -3567,8 +3590,8 @@ CGFloat _myRoundNumber(CGFloat f)
     if (f == 0 || f == CGFLOAT_MAX || f == -CGFLOAT_MAX)
         return f;
 
-    int fi = (int)f;
-    if (f == fi)
+    int fi = round(f);
+    if (_myCGFloatEqual(f, fi))
         return fi;
 
     //按精度四舍五入