From be1f7c1d4c5fb5c270b0cb5c9d91dc8701c1517d Mon Sep 17 00:00:00 2001
From: Jesse Bounds <jesse@rebounds.net>
Date: Tue, 24 Oct 2017 17:40:47 -0700
Subject: Simplify scale bar layout updates

---
 platform/ios/src/MGLMapView.mm  | 2 ++
 platform/ios/src/MGLScaleBar.mm | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 0e76c0c71c..470e57ab5d 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -1016,6 +1016,8 @@ public:
 - (void)layoutSubviews
 {
     [super layoutSubviews];
+    
+    [self.scaleBar invalidateIntrinsicContentSize];
 
     [self adjustContentInset];
 
diff --git a/platform/ios/src/MGLScaleBar.mm b/platform/ios/src/MGLScaleBar.mm
index 410aa7d57e..966555e46a 100644
--- a/platform/ios/src/MGLScaleBar.mm
+++ b/platform/ios/src/MGLScaleBar.mm
@@ -225,9 +225,6 @@ static const CGFloat MGLFeetPerMeter = 3.28084;
                             CGRectGetMinY(self.frame),
                             size.width,
                             size.height);
-    
-    [self invalidateIntrinsicContentSize];
-    [self setNeedsLayout];
 }
 
 - (void)updateVisibility {
-- 
cgit v1.2.1