Merge pull request #110 from square/entin/scale-from-traits

Get scale factor for view from trait collection instead of screen
square · Apr 17, 2024 · a1f0be7 · a1f0be7
2 parents 3fce4c7 + 1f443b9
commit a1f0be7
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/Paralayout/PixelRounding.swift b/Paralayout/PixelRounding.swift
@@ -34,7 +34,17 @@ extension UIScreen: ScaleFactorProviding {
 extension UIView: ScaleFactorProviding {
 
     public var pixelsPerPoint: CGFloat {
+        let scaleFromTraits = traitCollection.displayScale
+
+        // The trait collection is the authority for display scale, but sometimes the trait collection does not have a
+        // value for the scale, in which case it will return 0, breaking all the things.
+        if scaleFromTraits > 0 {
+            return scaleFromTraits
+        }
+
+        #if os(iOS)
         return (window?.screen ?? UIScreen.main).pixelsPerPoint
+        #endif
     }
 
 }