diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-11-10 13:55:21 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-11-11 16:59:49 +0200 |
| commit | 5a24ac605b23ae1d28ac052eb6eeae559db3bb79 (patch) | |
| tree | f792f232400117599ef68e8bb9714ad04d609d92 /platform/default/glfw_view.cpp | |
| parent | 99ac8d8720fcd838141b291e4c85466aefbb88f6 (diff) | |
| download | qtlocation-mapboxgl-5a24ac605b23ae1d28ac052eb6eeae559db3bb79.tar.gz | |
[core] Use PrecisionPoint in zoom and angle functions
Diffstat (limited to 'platform/default/glfw_view.cpp')
| -rw-r--r-- | platform/default/glfw_view.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp index b0a7f90f94..6a5524d2c9 100644 --- a/platform/default/glfw_view.cpp +++ b/platform/default/glfw_view.cpp @@ -279,7 +279,7 @@ void GLFWView::onScroll(GLFWwindow *window, double /*xOffset*/, double yOffset) scale = 1.0 / scale; } - view->map->scaleBy(scale, view->lastX, view->lastY); + view->map->scaleBy(scale, { view->lastX, view->lastY }); } void GLFWView::onWindowResize(GLFWwindow *window, int width, int height) { @@ -313,9 +313,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, view->lastX, view->lastY, std::chrono::milliseconds(500)); + view->map->scaleBy(0.5, { view->lastX, view->lastY }, std::chrono::milliseconds(500)); } else { - view->map->scaleBy(2.0, view->lastX, view->lastY, std::chrono::milliseconds(500)); + view->map->scaleBy(2.0, { view->lastX, view->lastY }, std::chrono::milliseconds(500)); } } view->lastClick = now; @@ -335,7 +335,7 @@ void GLFWView::onMouseMove(GLFWwindow *window, double x, double y) { mbgl::PrecisionPoint(x, flippedY)); } } else if (view->rotating) { - view->map->rotateBy(view->lastX, view->lastY, x, y); + view->map->rotateBy({ view->lastX, view->lastY }, { x, y }); } view->lastX = x; view->lastY = y; |