diff options
author | Morten Sørvig <morten.sorvig@qt.io> | 2021-01-26 12:53:25 +0100 |
---|---|---|
committer | Morten Sørvig <morten.sorvig@qt.io> | 2021-02-02 10:22:52 +0100 |
commit | dc3446c1e35fb451070654709fe3c9b71eef7bb6 (patch) | |
tree | 523713f2769da1d93835a65162f2256e226e13ed /src/plugins/platforms/android/qandroidinputcontext.cpp | |
parent | 8ad66a14889e8e1b79eb7e1ca86faa1c19132fd3 (diff) |
Make setSelectionOnFocusObject() take native pixels
Change the setSelectionOnFocusObject() to take geometry
arguments in native pixels, in order to be consistent with
other QPlatformInputContext API.
Calling code which pass non-native geometry must be updated
(in practice only the Android platform plugin).
Change-Id: I1c61b8cf583afe607567d6056ca7ff23cc3de3f3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/android/qandroidinputcontext.cpp')
-rw-r--r-- | src/plugins/platforms/android/qandroidinputcontext.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp index 24cb261e6f..211f0e4d95 100644 --- a/src/plugins/platforms/android/qandroidinputcontext.cpp +++ b/src/plugins/platforms/android/qandroidinputcontext.cpp @@ -824,12 +824,7 @@ void QAndroidInputContext::longPress(int x, int y) BatchEditLock batchEditLock(this); focusObjectStopComposing(); - - const double pixelDensity = - QGuiApplication::focusWindow() - ? QHighDpiScaling::factor(QGuiApplication::focusWindow()) - : QHighDpiScaling::factor(QtAndroid::androidPlatformIntegration()->screen()); - const QPointF touchPoint(x / pixelDensity, y / pixelDensity); + const QPointF touchPoint(x, y); setSelectionOnFocusObject(touchPoint, touchPoint); QInputMethodQueryEvent query(Qt::ImCursorPosition | Qt::ImAnchorPosition | Qt::ImTextBeforeCursor | Qt::ImTextAfterCursor); |