From 0bb56d837d01e8105671b8919e6d567b5e172ec1 Mon Sep 17 00:00:00 2001 From: Cristian Luis Duarte Date: Mon, 5 Mar 2018 18:08:06 -0300 Subject: [PATCH] Android - Use a different variable to save the reported dpi by qt in TouchscreenVirtualPadDevice --- .../src/input-plugins/TouchscreenVirtualPadDevice.cpp | 3 ++- .../src/input-plugins/TouchscreenVirtualPadDevice.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp index bbe6102d21..e323ed8fbc 100644 --- a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp +++ b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp @@ -43,10 +43,11 @@ void TouchscreenVirtualPadDevice::init() { _fixedPosition = true; // This should be config QScreen* eventScreen = qApp->primaryScreen(); - if (_screenDPI != eventScreen->physicalDotsPerInch()) { + if (_screenDPIProvided != eventScreen->physicalDotsPerInch()) { _screenWidthCenter = eventScreen->size().width() / 2; _screenDPIScale.x = (float)eventScreen->physicalDotsPerInchX(); _screenDPIScale.y = (float)eventScreen->physicalDotsPerInchY(); + _screenDPIProvided = eventScreen->physicalDotsPerInch(); _screenDPI = eventScreen->physicalDotsPerInch(); _fixedRadius = _screenDPI * 256 / 534; diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.h b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.h index 4b95f3fbaf..d5019da805 100644 --- a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.h +++ b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.h @@ -65,6 +65,7 @@ protected: float _lastPinchScale; float _pinchScale; float _screenDPI; + qreal _screenDPIProvided; glm::vec2 _screenDPIScale; bool _validTouchLeft; glm::vec2 _firstTouchLeftPoint;