diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2017-03-06 11:39:28 -0800 |
|---|---|---|
| committer | Justin R. Miller <incanus@codesorcery.net> | 2017-03-06 17:09:25 -0800 |
| commit | b591062ef5c02ae67fad581fe4c6598d4d8848b8 (patch) | |
| tree | 6099a37ab710d57699e8cd62123db658db46ded1 /platform/darwin/src/MGLBackgroundStyleLayer.mm | |
| parent | 8c894854ea07ae81b9a2f7f1313c8a0eeabd76c5 (diff) | |
| download | qtlocation-mapboxgl-b591062ef5c02ae67fad581fe4c6598d4d8848b8.tar.gz | |
[ios, macos] updated to MGLDurationFromTimeInterval and MGLTimeIntervalFromDuration
Diffstat (limited to 'platform/darwin/src/MGLBackgroundStyleLayer.mm')
| -rw-r--r-- | platform/darwin/src/MGLBackgroundStyleLayer.mm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/platform/darwin/src/MGLBackgroundStyleLayer.mm b/platform/darwin/src/MGLBackgroundStyleLayer.mm index 596b8e6dc4..84218aefe7 100644 --- a/platform/darwin/src/MGLBackgroundStyleLayer.mm +++ b/platform/darwin/src/MGLBackgroundStyleLayer.mm @@ -108,7 +108,7 @@ MGLTransition transition; [transitionValue getValue:&transition]; - mbgl::style::TransitionOptions options { { MGLDurationInSecondsFromTimeInterval(transition.duration) }, { MGLDurationInSecondsFromTimeInterval(transition.delay) } }; + mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; self.rawLayer->setBackgroundColorTransition(options); } @@ -127,8 +127,8 @@ mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getBackgroundColorTransition(); MGLTransition transition; - transition.duration = MGLTimeIntervalFromDurationInSeconds(transitionOptions.duration.value_or(mbgl::Duration::zero())); - transition.delay = MGLTimeIntervalFromDurationInSeconds(transitionOptions.delay.value_or(mbgl::Duration::zero())); + transition.duration = MGLTimeIntervalFromDuration(transitionOptions.duration.value_or(mbgl::Duration::zero())); + transition.delay = MGLTimeIntervalFromDuration(transitionOptions.delay.value_or(mbgl::Duration::zero())); NSValue *transitionValue = [NSValue value:&transition withObjCType:@encode(MGLTransition)]; return transitionValue; @@ -147,7 +147,7 @@ MGLTransition transition; [transitionValue getValue:&transition]; - mbgl::style::TransitionOptions options { { MGLDurationInSecondsFromTimeInterval(transition.duration) }, { MGLDurationInSecondsFromTimeInterval(transition.delay) } }; + mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; self.rawLayer->setBackgroundOpacityTransition(options); } @@ -166,8 +166,8 @@ mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getBackgroundOpacityTransition(); MGLTransition transition; - transition.duration = MGLTimeIntervalFromDurationInSeconds(transitionOptions.duration.value_or(mbgl::Duration::zero())); - transition.delay = MGLTimeIntervalFromDurationInSeconds(transitionOptions.delay.value_or(mbgl::Duration::zero())); + transition.duration = MGLTimeIntervalFromDuration(transitionOptions.duration.value_or(mbgl::Duration::zero())); + transition.delay = MGLTimeIntervalFromDuration(transitionOptions.delay.value_or(mbgl::Duration::zero())); NSValue *transitionValue = [NSValue value:&transition withObjCType:@encode(MGLTransition)]; return transitionValue; @@ -186,7 +186,7 @@ MGLTransition transition; [transitionValue getValue:&transition]; - mbgl::style::TransitionOptions options { { MGLDurationInSecondsFromTimeInterval(transition.duration) }, { MGLDurationInSecondsFromTimeInterval(transition.delay) } }; + mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; self.rawLayer->setBackgroundPatternTransition(options); } @@ -205,8 +205,8 @@ mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getBackgroundPatternTransition(); MGLTransition transition; - transition.duration = MGLTimeIntervalFromDurationInSeconds(transitionOptions.duration.value_or(mbgl::Duration::zero())); - transition.delay = MGLTimeIntervalFromDurationInSeconds(transitionOptions.delay.value_or(mbgl::Duration::zero())); + transition.duration = MGLTimeIntervalFromDuration(transitionOptions.duration.value_or(mbgl::Duration::zero())); + transition.delay = MGLTimeIntervalFromDuration(transitionOptions.delay.value_or(mbgl::Duration::zero())); NSValue *transitionValue = [NSValue value:&transition withObjCType:@encode(MGLTransition)]; return transitionValue; |