Fix rounding errors that caused false positives

qmchenry · Jun 18, 2020 · 7fab1db · 7fab1db
1 parent e0f7d7e
commit 7fab1db
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Sources/UILint/UIKitHelpers.swift b/Sources/UILint/UIKitHelpers.swift
@@ -26,7 +26,7 @@ extension UIView {
 
     // View's frame in global/window coordinates
     var windowFrame: CGRect? {
-        superview?.convert(frame, to: parentViewController()?.view)
+        superview?.convert(frame, to: parentViewController()?.view).rounded
     }
 
     // Return an array of all subviews including those not included in the
@@ -46,6 +46,12 @@ extension UIView {
     }
 }
 
+extension CGRect {
+    var rounded: CGRect {
+        CGRect(x: origin.x.rounded(), y: origin.y.rounded(), width: width.rounded(), height: height.rounded())
+    }
+}
+
 extension UIImage {
     func crop(to rect: CGRect, viewSize: CGSize) -> UIImage {
         let cropScale = max(size.width/viewSize.width, size.height/viewSize.height) * scale

diff --git a/Sources/UILint/UILabelChecks.swift b/Sources/UILint/UILabelChecks.swift
@@ -27,7 +27,7 @@ extension Element {
             let frame = base.windowFrame else { return false }
         guard text.count > 0 else { return false }
         guard frame.width > 0 else { return true }
-        return labelSize().height > frame.size.height
+        return labelSize().height.rounded() > frame.size.height.rounded()
     }
 
     func isLabelOffscreen(windowSize: CGSize) -> Bool {