From bfae01300ea2fc9ee5ccb50cef6670b0f7c66ffd Mon Sep 17 00:00:00 2001 From: fysx Date: Thu, 6 Feb 2014 01:02:47 +0100 Subject: [PATCH] fixed mouse coordinates due to the love.window.getScale() change --- jni/love/src/modules/event/sdl/Event.cpp | 2 ++ jni/love/src/modules/mouse/sdl/Mouse.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/jni/love/src/modules/event/sdl/Event.cpp b/jni/love/src/modules/event/sdl/Event.cpp index f32a1ce0..35a1040d 100644 --- a/jni/love/src/modules/event/sdl/Event.cpp +++ b/jni/love/src/modules/event/sdl/Event.cpp @@ -42,6 +42,7 @@ namespace sdl // we want them in pixel coordinates (may be different with high-DPI enabled.) static void windowToPixelCoords(int *x, int *y) { +#ifndef LOVE_ANDROID double scale = 1.0; window::Window *window = (window::Window *) Module::findInstance("love.window."); @@ -53,6 +54,7 @@ static void windowToPixelCoords(int *x, int *y) if (y != nullptr) *y = int(double(*y) * scale); +#endif } diff --git a/jni/love/src/modules/mouse/sdl/Mouse.cpp b/jni/love/src/modules/mouse/sdl/Mouse.cpp index 74e86291..7b1ff67e 100644 --- a/jni/love/src/modules/mouse/sdl/Mouse.cpp +++ b/jni/love/src/modules/mouse/sdl/Mouse.cpp @@ -36,6 +36,7 @@ namespace sdl // we want them in pixel coordinates (may be different with high-DPI enabled.) static void windowToPixelCoords(int *x, int *y) { +#ifndef LOVE_ANDROID double scale = 1.0; love::window::Window *window = love::window::sdl::Window::getSingleton(); @@ -47,11 +48,13 @@ static void windowToPixelCoords(int *x, int *y) if (y != nullptr) *y = int(double(*y) * scale); +#endif } // And vice versa for setting mouse coordinates. static void pixelToWindowCoords(int *x, int *y) { +#ifndef LOVE_ANDROID double scale = 1.0; love::window::Window *window = love::window::sdl::Window::getSingleton(); @@ -63,6 +66,7 @@ static void pixelToWindowCoords(int *x, int *y) if (y != nullptr) *y = int(double(*y) / scale); +#endif } const char *Mouse::getName() const