[ios, osx] Optionally animate content insets change

This commit is contained in:
Minh Nguyễn
2016-01-18 17:45:38 -08:00
committed by Minh Nguyễn
parent 07c4c54111
commit 65f6eb25b5
4 changed files with 91 additions and 21 deletions

View File

@@ -810,24 +810,37 @@ std::chrono::steady_clock::duration MGLDurationInSeconds(float duration)
return;
}
UIEdgeInsets contentInsets = UIEdgeInsetsZero;
UIEdgeInsets contentInset = UIEdgeInsetsZero;
CGPoint topPoint = CGPointMake(0, viewController.topLayoutGuide.length);
contentInsets.top = [self convertPoint:topPoint fromView:viewController.view].y;
contentInset.top = [self convertPoint:topPoint fromView:viewController.view].y;
CGPoint bottomPoint = CGPointMake(0, CGRectGetMaxY(viewController.view.bounds)
- viewController.bottomLayoutGuide.length);
contentInsets.bottom = (CGRectGetMaxY(self.bounds) - [self convertPoint:bottomPoint
fromView:viewController.view].y);
if ( ! UIEdgeInsetsEqualToEdgeInsets(contentInsets, self.contentInset))
contentInset.bottom = (CGRectGetMaxY(self.bounds)
- [self convertPoint:bottomPoint fromView:viewController.view].y);
self.contentInset = contentInset;
}
- (void)setContentInset:(UIEdgeInsets)contentInset
{
[self setContentInset:contentInset animated:NO];
}
- (void)setContentInset:(UIEdgeInsets)contentInset animated:(BOOL)animated
{
if (UIEdgeInsetsEqualToEdgeInsets(contentInset, self.contentInset))
{
// After adjusting the content insets, move the center coordinate from
// the old frame of reference to the new one represented by the newly
// set content insets.
CLLocationCoordinate2D oldCenter = self.centerCoordinate;
self.contentInset = contentInsets;
// Don’t call -setCenterCoordinate:, which resets the user tracking mode.
[self _setCenterCoordinate:oldCenter animated:NO];
return;
}
// After adjusting the content inset, move the center coordinate from the
// old frame of reference to the new one represented by the newly set
// content inset.
CLLocationCoordinate2D oldCenter = self.centerCoordinate;
_contentInset = contentInset;
// Don’t call -setCenterCoordinate:, which resets the user tracking mode.
[self _setCenterCoordinate:oldCenter animated:animated];
}
/// Returns the frame of inset content within the map view.

View File

@@ -1117,14 +1117,24 @@ public:
contentInsets = NSEdgeInsetsZero;
}
if (!NSEdgeInsetsEqual(contentInsets, self.contentInsets)) {
// After adjusting the content insets, move the center coordinate from
// the old frame of reference to the new one represented by the newly
// set content insets.
CLLocationCoordinate2D oldCenter = self.centerCoordinate;
self.contentInsets = contentInsets;
self.centerCoordinate = oldCenter;
self.contentInsets = contentInsets;
}
- (void)setContentInsets:(NSEdgeInsets)contentInsets {
[self setContentInsets:contentInsets animated:NO];
}
- (void)setContentInsets:(NSEdgeInsets)contentInsets animated:(BOOL)animated {
if (NSEdgeInsetsEqual(contentInsets, self.contentInsets)) {
return;
}
// After adjusting the content insets, move the center coordinate from the
// old frame of reference to the new one represented by the newly set
// content insets.
CLLocationCoordinate2D oldCenter = self.centerCoordinate;
_contentInsets = contentInsets;
[self setCenterCoordinate:oldCenter animated:animated];
}
#pragma mark Mouse events and gestures