diff options
Diffstat (limited to 'platform/darwin/src/MGLBackgroundStyleLayer.mm')
| -rw-r--r-- | platform/darwin/src/MGLBackgroundStyleLayer.mm | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/platform/darwin/src/MGLBackgroundStyleLayer.mm b/platform/darwin/src/MGLBackgroundStyleLayer.mm index c754de43c2..00b10cf2be 100644 --- a/platform/darwin/src/MGLBackgroundStyleLayer.mm +++ b/platform/darwin/src/MGLBackgroundStyleLayer.mm @@ -58,19 +58,15 @@ MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting backgroundColorTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setBackgroundColorTransition(options); + self.rawLayer->setBackgroundColorTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)backgroundColorTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getBackgroundColorTransition(); - MGLTransition transition; - transition.duration = MGLTimeIntervalFromDuration(transitionOptions.duration.value_or(mbgl::Duration::zero())); - transition.delay = MGLTimeIntervalFromDuration(transitionOptions.delay.value_or(mbgl::Duration::zero())); - return transition; + return MGLTransitionFromOptions(transitionOptions); } - (void)setBackgroundOpacity:(NSExpression *)backgroundOpacity { @@ -95,19 +91,15 @@ MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting backgroundOpacityTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setBackgroundOpacityTransition(options); + self.rawLayer->setBackgroundOpacityTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)backgroundOpacityTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getBackgroundOpacityTransition(); - MGLTransition transition; - transition.duration = MGLTimeIntervalFromDuration(transitionOptions.duration.value_or(mbgl::Duration::zero())); - transition.delay = MGLTimeIntervalFromDuration(transitionOptions.delay.value_or(mbgl::Duration::zero())); - return transition; + return MGLTransitionFromOptions(transitionOptions); } - (void)setBackgroundPattern:(NSExpression *)backgroundPattern { @@ -132,19 +124,15 @@ MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting backgroundPatternTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setBackgroundPatternTransition(options); + self.rawLayer->setBackgroundPatternTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)backgroundPatternTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getBackgroundPatternTransition(); - MGLTransition transition; - transition.duration = MGLTimeIntervalFromDuration(transitionOptions.duration.value_or(mbgl::Duration::zero())); - transition.delay = MGLTimeIntervalFromDuration(transitionOptions.delay.value_or(mbgl::Duration::zero())); - return transition; + return MGLTransitionFromOptions(transitionOptions); } @end |