diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2017-02-28 13:22:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-28 13:22:47 -0500 |
| commit | 34fef22d95124e3e59b6c7962bdc4a01c84dde2e (patch) | |
| tree | 255fc0fcb352684251c88cfb0ec24a3822008e99 /platform/glfw | |
| parent | 05ec852885608070d7a5df50c7a098441e643bce (diff) | |
| download | qtlocation-mapboxgl-34fef22d95124e3e59b6c7962bdc4a01c84dde2e.tar.gz | |
[core] [android] - allow zooming/scaling to use AnimationOptions (#8181)
[glfw] - allow glfw binding to use AnimationOptions instead of using direction directly
Diffstat (limited to 'platform/glfw')
| -rw-r--r-- | platform/glfw/glfw_view.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index 15a229d4ae..4070a0fe9b 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -417,9 +417,9 @@ void GLFWView::onMouseClick(GLFWwindow *window, int button, int action, int modi double now = glfwGetTime(); if (now - view->lastClick < 0.4 /* ms */) { if (modifiers & GLFW_MOD_SHIFT) { - view->map->scaleBy(0.5, mbgl::ScreenCoordinate { view->lastX, view->lastY }, mbgl::Milliseconds(500)); + view->map->scaleBy(0.5, mbgl::ScreenCoordinate { view->lastX, view->lastY }, mbgl::AnimationOptions{{mbgl::Milliseconds(500)}}); } else { - view->map->scaleBy(2.0, mbgl::ScreenCoordinate { view->lastX, view->lastY }, mbgl::Milliseconds(500)); + view->map->scaleBy(2.0, mbgl::ScreenCoordinate { view->lastX, view->lastY }, mbgl::AnimationOptions{{mbgl::Milliseconds(500)}}); } } view->lastClick = now; |