Merge pull request #30 from iWECon/compatible_flexlayout

iwecon · web-flow · commit e33637000abc · 2023-05-18T10:53:20.000+08:00
Compatible FlexLayout
diff --git a/Sources/StackKit/Layer/HStackLayer.swift b/Sources/StackKit/Layer/HStackLayer.swift
@@ -109,9 +109,7 @@ open class HStackLayer: CALayer, StackLayer {
     }
     
     public func sizeThatFits(_ size: CGSize) -> CGSize {
-        setNeedsLayout()
-        layoutIfNeeded()
-        
+        layoutSublayers()
         return contentSize
     }
     
diff --git a/Sources/StackKit/Layer/VStackLayer.swift b/Sources/StackKit/Layer/VStackLayer.swift
@@ -55,9 +55,7 @@ open class VStackLayer: CALayer, StackLayer {
     }
     
     open override func preferredFrameSize() -> CGSize {
-        setNeedsLayout()
-        setNeedsDisplay()
-        
+        layoutSublayers()
         return contentSize
     }
     

Original file line number	Diff line number	Diff line change
`@@ -109,9 +109,7 @@ open class HStackLayer: CALayer, StackLayer {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`public func sizeThatFits(_ size: CGSize) -> CGSize {`
`112`		`- setNeedsLayout()`
`113`		`- layoutIfNeeded()`
`114`		`-`
	`112`	`+ layoutSublayers()`
`115`	`113`	`return contentSize`
`116`	`114`	`}`
`117`	`115`
Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,7 @@ open class VStackLayer: CALayer, StackLayer {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`open override func preferredFrameSize() -> CGSize {`
`58`		`- setNeedsLayout()`
`59`		`- setNeedsDisplay()`
`60`		`-`
	`58`	`+ layoutSublayers()`
`61`	`59`	`return contentSize`
`62`	`60`	`}`
`63`	`61`