minor fixes

Author: Ruslan Dzhafarov

Sources/Extensions/CALayer+PinLayout.swift

@@ -30,8 +30,8 @@ extension CALayer: Layoutable {
         return sublayers ?? []
     }
 
-    public var isVisible: Bool {
-        !isHidden && opacity > 0
+    public var isConsideredVisibleForViewFilters: Bool {
+        return !isHidden && opacity > 0
     }
 
     public var pin: PinLayout<CALayer> {

Sources/Extensions/NSView+PinLayout.swift

@@ -33,8 +33,8 @@ extension NSView: Layoutable {
         return PinLayout(view: self, keepTransform: false)
     }
 
-    public var isVisible: Bool {
-        !isHidden && alphaValue > 0
+    public var isConsideredVisibleForViewFilters: Bool {
+        return !isHidden && alphaValue > 0
     }
 
     @objc public var pinObjc: PinLayoutObjC {

Sources/Extensions/UIView+PinLayout.swift

@@ -37,8 +37,8 @@ extension UIView: Layoutable, SizeCalculable {
         return PinLayoutObjCImpl(view: self, keepTransform: true)
     }
 
-    public var isVisible: Bool {
-        !isHidden && alpha > 0
+    public var isConsideredVisibleForViewFilters: Bool {
+        return !isHidden && alpha > 0
     }
 
     public func getRect(keepTransform: Bool) -> CGRect {

Sources/Layoutable.swift

@@ -29,7 +29,7 @@ public protocol Layoutable: AnyObject, Equatable, CustomDebugStringConvertible {
     var superview: PinView? { get }
     var subviews: [PinView] { get }
 
-    var isVisible: Bool { get }
+    var isConsideredVisibleForViewFilters: Bool { get }
 
     func getRect(keepTransform: Bool) -> CGRect
     func setRect(_ rect: CGRect, keepTransform: Bool)

Sources/PinLayout+WrapContent.swift

@@ -31,7 +31,7 @@ extension PinLayout {
      - viewFilter: Specify whether to include all views or only visible ones.
      */
     @discardableResult
-    public func wrapContent(viewFilter: ViewFilter = .none) -> PinLayout {
+    public func wrapContent(viewFilter: ViewFilter = .all) -> PinLayout {
         return wrapContent(.all, padding: PEdgeInsets(top: 0, left: 0, bottom: 0, right: 0), viewFilter: viewFilter, { return "wrapContent()" })
     }
 
@@ -43,7 +43,7 @@ extension PinLayout {
      - viewFilter: Specify whether to include all views or only visible ones.
      */
     @discardableResult
-    public func wrapContent(padding: CGFloat, viewFilter: ViewFilter = .none) -> PinLayout {
+    public func wrapContent(padding: CGFloat, viewFilter: ViewFilter = .all) -> PinLayout {
         return wrapContent(.all, padding: PEdgeInsets(top: padding, left: padding, bottom: padding, right: padding), viewFilter: viewFilter, { return "wrapContent(padding: \(padding)" })
     }
 
@@ -58,7 +58,7 @@ extension PinLayout {
      - viewFilter: Specify whether to include all views or only visible ones.
      */
     @discardableResult
-    public func wrapContent(padding: PEdgeInsets, viewFilter: ViewFilter = .none) -> PinLayout {
+    public func wrapContent(padding: PEdgeInsets, viewFilter: ViewFilter = .all) -> PinLayout {
         return wrapContent(.all, padding: padding, viewFilter: viewFilter, { return "wrapContent(padding: \(insetsDescription(padding))" })
     }
 
@@ -72,7 +72,7 @@ extension PinLayout {
      - viewFilter: Specify whether to include all views or only visible ones.
      */
     @discardableResult
-    public func wrapContent(_ type: WrapType, viewFilter: ViewFilter = .none) -> PinLayout {
+    public func wrapContent(_ type: WrapType, viewFilter: ViewFilter = .all) -> PinLayout {
         return wrapContent(type, padding: PEdgeInsets(top: 0, left: 0, bottom: 0, right: 0), viewFilter: viewFilter, { return "wrapContent(\(type.description)" })
     }
 
@@ -88,7 +88,7 @@ extension PinLayout {
      - viewFilter: Specify whether to include all views or only visible ones.
      */
     @discardableResult
-    public func wrapContent(_ type: WrapType, padding: CGFloat, viewFilter: ViewFilter = .none) -> PinLayout {
+    public func wrapContent(_ type: WrapType, padding: CGFloat, viewFilter: ViewFilter = .all) -> PinLayout {
         return wrapContent(type, padding: PEdgeInsets(top: padding, left: padding, bottom: padding, right: padding), viewFilter: viewFilter, { return "wrapContent(\(type.description), padding: \(padding)" })
     }
 
@@ -104,16 +104,16 @@ extension PinLayout {
      - viewFilter: Specify whether to include all views or only visible ones.
      */
     @discardableResult
-    public func wrapContent(_ type: WrapType, padding: PEdgeInsets, viewFilter: ViewFilter = .none) -> PinLayout {
+    public func wrapContent(_ type: WrapType, padding: PEdgeInsets, viewFilter: ViewFilter = .all) -> PinLayout {
         return wrapContent(type, padding: padding, viewFilter: viewFilter, { return "wrapContent(\(type.description), padding: \(insetsDescription(padding))" })
     }
 
     private func wrapContent(_ type: WrapType, padding: PEdgeInsets, viewFilter: ViewFilter, _ context: Context) -> PinLayout {
         let subviews: [PinView.PinView]
         switch viewFilter {
         case .visibleOnly:
-            subviews = view.subviews.filter { $0.isVisible }
-        case .none:
+            subviews = view.subviews.filter { $0.isConsideredVisibleForViewFilters }
+        case .all:
             subviews = view.subviews
         }
 

Sources/Types.swift

@@ -195,8 +195,8 @@ public enum FitType {
 }
 
 @objc public enum ViewFilter: Int {
-    /// No filter, use all views
-    case none
+    /// Consider all views
+    case all
     /// Consider only visible views (isHidden is false and alpha is > 0)
     case visibleOnly
 }