xAxis labels fixed on iPhone 5s and later Boris-Em#294

diniska · May 11, 2017 · 02d50ce · 02d50ce · diniska · May 15, 2017
1 parent 0a4f545
commit 02d50ce
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Classes/BEMSimpleLineGraphView.m b/Classes/BEMSimpleLineGraphView.m
@@ -11,6 +11,10 @@
 
 const CGFloat BEMNullGraphValue = CGFLOAT_MAX;
 
+static inline BOOL CGRectContainsRectHorizontally(CGRect rect1, CGRect rect2) {
+    return CGRectGetMinX(rect1) <= CGRectGetMinX(rect2) &&
+           CGRectGetMaxX(rect2) <= CGRectGetMaxX(rect1);
+}
 
 #if !__has_feature(objc_arc)
 // Add the -fobjc-arc flag to enable ARC for only these files, as described in the ARC documentation: http://clang.llvm.org/docs/AutomaticReferenceCounting.html
@@ -792,7 +796,7 @@ - (void)drawXAxis {
             else [overlapLabels addObject:label]; // Overlapped
         }
 
-        BOOL fullyContainsLabel = CGRectContainsRect(self.bounds, label.frame);
+        BOOL fullyContainsLabel = CGRectContainsRectHorizontally(self.bounds, label.frame);
         if (!fullyContainsLabel) {
             [overlapLabels addObject:label];
         }