Android selection handles
This commits implement the cursor and selection handle in the platform plugin. Task-number: QTBUG-34867 Change-Id: Icb3fd9ddfd9f4152e2004078a92a3d9502e9113c Reviewed-by: BogDan Vatra <bogdan@kdab.com>bb10
Olivier Goffart
Olivier Goffart (Woboq GmbH)
parent
bc2cee35c3
commit
3c6220c4f8
|
|
@ -0,0 +1,205 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
|
||||
** Contact: http://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the Android port of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 3 requirements
|
||||
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 2.0 or (at your option) the GNU General
|
||||
** Public license version 3 or any later version approved by the KDE Free
|
||||
** Qt Foundation. The licenses are as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
** included in the packaging of this file. Please review the following
|
||||
** information to ensure the GNU General Public License requirements will
|
||||
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
** https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
package org.qtproject.qt5.android;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.util.DisplayMetrics;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.ImageView;
|
||||
import android.content.res.TypedArray;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.view.MotionEvent;
|
||||
import android.widget.PopupWindow;
|
||||
import android.app.Activity;
|
||||
import android.view.ViewTreeObserver;
|
||||
|
||||
/* This view represents one of the handle (selection or cursor handle) */
|
||||
class CursorView extends ImageView
|
||||
{
|
||||
private CursorHandle mHandle;
|
||||
// The coordinare which where clicked
|
||||
private int m_offsetX;
|
||||
private int m_offsetY;
|
||||
|
||||
CursorView (Context context, CursorHandle handle) {
|
||||
super(context);
|
||||
mHandle = handle;
|
||||
}
|
||||
|
||||
// Called when the handle was moved programatically , with the delta amount in pixels
|
||||
public void adjusted(int dx, int dy) {
|
||||
m_offsetX += dx;
|
||||
m_offsetY += dy;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onTouchEvent(MotionEvent ev) {
|
||||
switch (ev.getActionMasked()) {
|
||||
case MotionEvent.ACTION_DOWN: {
|
||||
m_offsetX = Math.round(ev.getRawX());
|
||||
m_offsetY = Math.round(ev.getRawY());
|
||||
break;
|
||||
}
|
||||
|
||||
case MotionEvent.ACTION_MOVE: {
|
||||
mHandle.updatePosition(Math.round(ev.getRawX()) - m_offsetX,
|
||||
Math.round(ev.getRawY()) - m_offsetY);
|
||||
break;
|
||||
}
|
||||
|
||||
case MotionEvent.ACTION_UP:
|
||||
break;
|
||||
|
||||
case MotionEvent.ACTION_CANCEL:
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Helper class that manages a cursor or selection handle
|
||||
public class CursorHandle implements ViewTreeObserver.OnPreDrawListener
|
||||
{
|
||||
private View m_layout = null;
|
||||
private CursorView m_cursorView = null;
|
||||
private PopupWindow m_popup = null;
|
||||
private int m_id;
|
||||
private int m_attr;
|
||||
private Activity m_activity;
|
||||
private int m_posX;
|
||||
private int m_posY;
|
||||
private int m_lastX;
|
||||
private int m_lastY;
|
||||
int tolerance;
|
||||
|
||||
public CursorHandle(Activity activity, View layout, int id, int attr) {
|
||||
m_activity = activity;
|
||||
m_id = id;
|
||||
m_attr = attr;
|
||||
m_layout = layout;
|
||||
DisplayMetrics metrics = new DisplayMetrics();
|
||||
activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
|
||||
tolerance = Math.round(2 * metrics.density);
|
||||
m_lastX = m_lastY = -1 - tolerance;
|
||||
}
|
||||
|
||||
private boolean initOverlay(){
|
||||
if (m_popup == null){
|
||||
|
||||
Context context = m_layout.getContext();
|
||||
int[] attrs = {m_attr};
|
||||
TypedArray a = context.getTheme().obtainStyledAttributes(attrs);
|
||||
Drawable drawable = a.getDrawable(0);
|
||||
|
||||
m_cursorView = new CursorView(context, this);
|
||||
m_cursorView.setImageDrawable(drawable);
|
||||
// m_layout.addView(m_cursorView);
|
||||
|
||||
m_popup = new PopupWindow(context, null, android.R.attr.textSelectHandleWindowStyle);
|
||||
m_popup.setSplitTouchEnabled(true);
|
||||
m_popup.setClippingEnabled(false);
|
||||
m_popup.setContentView(m_cursorView);
|
||||
m_popup.setWidth(drawable.getIntrinsicWidth());
|
||||
m_popup.setHeight(drawable.getIntrinsicHeight());
|
||||
|
||||
m_layout.getViewTreeObserver().addOnPreDrawListener(this);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// Show the handle at a given position (or move it if it is already shown)
|
||||
public void setPosition(final int x, final int y){
|
||||
initOverlay();
|
||||
|
||||
final int[] location = new int[2];
|
||||
m_layout.getLocationOnScreen(location);
|
||||
|
||||
int x2 = x + location[0];
|
||||
int y2 = y + location[1];
|
||||
|
||||
if (m_id == QtNative.IdCursorHandle) {
|
||||
x2 -= m_cursorView.getWidth() / 2 ;
|
||||
} else if (m_id == QtNative.IdLeftHandle) {
|
||||
x2 -= m_cursorView.getWidth() * 3 / 4;
|
||||
} else if (m_id == QtNative.IdRightHandle) {
|
||||
x2 -= m_cursorView.getWidth() / 4;
|
||||
}
|
||||
|
||||
if (m_popup.isShowing()) {
|
||||
m_popup.update(x2, y2, -1, -1);
|
||||
m_cursorView.adjusted(x - m_posX, y - m_posY);
|
||||
} else {
|
||||
m_popup.showAtLocation(m_layout, 0, x2, y2);
|
||||
}
|
||||
|
||||
m_posX = x;
|
||||
m_posY = y;
|
||||
}
|
||||
|
||||
public void hide() {
|
||||
if (m_popup != null) {
|
||||
m_popup.dismiss();
|
||||
}
|
||||
}
|
||||
|
||||
// The handle was dragged by a given relative position
|
||||
public void updatePosition(int x, int y) {
|
||||
if (Math.abs(m_lastX - x) > tolerance || Math.abs(m_lastY - y) > tolerance) {
|
||||
QtNative.handleLocationChanged(m_id, x + m_posX, y + m_posY);
|
||||
m_lastX = x;
|
||||
m_lastY = y;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreDraw() {
|
||||
// This hook is called when the view location is changed
|
||||
// For example if the keyboard appears.
|
||||
// Adjust the position of the handle accordingly
|
||||
if (m_popup != null && m_popup.isShowing())
|
||||
setPosition(m_posX, m_posY);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
**
|
||||
** Copyright (C) 2014 BogDan Vatra <bogdan@kde.org>
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the Android port of the Qt Toolkit.
|
||||
|
|
@ -143,6 +144,9 @@ public class QtActivityDelegate
|
|||
private int m_portraitKeyboardHeight = 0;
|
||||
private int m_landscapeKeyboardHeight = 0;
|
||||
private int m_probeKeyboardHeightDelay = 50; // ms
|
||||
private CursorHandle m_cursorHandle;
|
||||
private CursorHandle m_leftSelectionHandle;
|
||||
private CursorHandle m_rightSelectionHandle;
|
||||
|
||||
public void setFullScreen(boolean enterFullScreen)
|
||||
{
|
||||
|
|
@ -470,6 +474,49 @@ public class QtActivityDelegate
|
|||
m_imm.updateSelection(m_editText, selStart, selEnd, candidatesStart, candidatesEnd);
|
||||
}
|
||||
|
||||
// Values coming from QAndroidInputContext::CursorHandleShowMode
|
||||
private static final int CursorHandleNotShown = 0;
|
||||
private static final int CursorHandleShowNormal = 1;
|
||||
private static final int CursorHandleShowSelection = 2;
|
||||
|
||||
/* called from the C++ code when the position of the cursor or selection handles needs to
|
||||
be adjusted
|
||||
|
||||
mode is one of QAndroidInputContext::CursorHandleShowMode)
|
||||
*/
|
||||
public void updateHandles(int mode, int x1, int y1, int x2, int y2)
|
||||
{
|
||||
if (mode == CursorHandleNotShown) {
|
||||
if (m_cursorHandle != null)
|
||||
m_cursorHandle.hide();
|
||||
if (m_rightSelectionHandle != null) {
|
||||
m_rightSelectionHandle.hide();
|
||||
m_leftSelectionHandle.hide();
|
||||
}
|
||||
} else if (mode == CursorHandleShowNormal) {
|
||||
if (m_cursorHandle == null) {
|
||||
m_cursorHandle = new CursorHandle(m_activity, m_layout, QtNative.IdCursorHandle,
|
||||
android.R.attr.textSelectHandle);
|
||||
}
|
||||
m_cursorHandle.setPosition(x1, y1);
|
||||
if (m_rightSelectionHandle != null) {
|
||||
m_rightSelectionHandle.hide();
|
||||
m_leftSelectionHandle.hide();
|
||||
}
|
||||
} else if (mode == CursorHandleShowSelection) {
|
||||
if (m_rightSelectionHandle == null) {
|
||||
m_leftSelectionHandle = new CursorHandle(m_activity, m_layout, QtNative.IdLeftHandle,
|
||||
android.R.attr.textSelectHandleLeft);
|
||||
m_rightSelectionHandle = new CursorHandle(m_activity, m_layout, QtNative.IdRightHandle,
|
||||
android.R.attr.textSelectHandleRight);
|
||||
}
|
||||
m_leftSelectionHandle.setPosition(x1,y1);
|
||||
m_rightSelectionHandle.setPosition(x2,y2);
|
||||
if (m_cursorHandle != null)
|
||||
m_cursorHandle.hide();
|
||||
}
|
||||
}
|
||||
|
||||
public boolean loadApplication(Activity activity, ClassLoader classLoader, Bundle loaderParams)
|
||||
{
|
||||
/// check parameters integrity
|
||||
|
|
|
|||
|
|
@ -492,6 +492,20 @@ public class QtNative
|
|||
});
|
||||
}
|
||||
|
||||
private static void updateHandles(final int mode,
|
||||
final int x1,
|
||||
final int y1,
|
||||
final int x2,
|
||||
final int y2)
|
||||
{
|
||||
runAction(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
m_activityDelegate.updateHandles(mode, x1, y1, x2, y2);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private static void showSoftwareKeyboard(final int x,
|
||||
final int y,
|
||||
final int width,
|
||||
|
|
@ -777,6 +791,13 @@ public class QtNative
|
|||
public static native void keyboardGeometryChanged(int x, int y, int width, int height);
|
||||
// keyboard methods
|
||||
|
||||
// handle methods
|
||||
public static final int IdCursorHandle = 1;
|
||||
public static final int IdLeftHandle = 2;
|
||||
public static final int IdRightHandle = 3;
|
||||
public static native void handleLocationChanged(int id, int x, int y);
|
||||
// handle methods
|
||||
|
||||
// dispatch events methods
|
||||
public static native boolean dispatchGenericMotionEvent(MotionEvent ev);
|
||||
public static native boolean dispatchKeyEvent(KeyEvent event);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 BogDan Vatra <bogdan@kde.org>
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
** Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
|
||||
** Contact: http://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the plugins of the Qt Toolkit.
|
||||
**
|
||||
|
|
@ -120,6 +121,12 @@ namespace QtAndroidInput
|
|||
return m_softwareKeyboardRect;
|
||||
}
|
||||
|
||||
void updateHandles(int mode, QPoint cursor, QPoint anchor)
|
||||
{
|
||||
QJNIObjectPrivate::callStaticMethod<void>(applicationClass(), "updateHandles", "(IIIII)V",
|
||||
mode, cursor.x(), cursor.y(), anchor.x(),
|
||||
anchor.y());
|
||||
}
|
||||
|
||||
static void mouseDown(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint x, jint y)
|
||||
{
|
||||
|
|
@ -225,6 +232,12 @@ namespace QtAndroidInput
|
|||
double(dw*size),
|
||||
double(dh*size));
|
||||
m_touchPoints.push_back(touchPoint);
|
||||
|
||||
if (state == Qt::TouchPointPressed) {
|
||||
QAndroidInputContext *inputContext = QAndroidInputContext::androidInputContext();
|
||||
if (inputContext && qGuiApp)
|
||||
QMetaObject::invokeMethod(inputContext, "touchDown", Q_ARG(int, x), Q_ARG(int, y));
|
||||
}
|
||||
}
|
||||
|
||||
static void touchEnd(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint /*action*/)
|
||||
|
|
@ -786,6 +799,18 @@ namespace QtAndroidInput
|
|||
#endif
|
||||
}
|
||||
|
||||
static void handleLocationChanged(JNIEnv */*env*/, jobject /*thiz*/, int id, int x, int y)
|
||||
{
|
||||
#ifdef QT_DEBUG_ANDROID_IM_PROTOCOL
|
||||
qDebug() << "@@@ handleLocationChanged" << id << x << y;
|
||||
#endif
|
||||
QAndroidInputContext *inputContext = QAndroidInputContext::androidInputContext();
|
||||
if (inputContext && qGuiApp)
|
||||
QMetaObject::invokeMethod(inputContext, "handleLocationChanged",
|
||||
Q_ARG(int, id), Q_ARG(int, x), Q_ARG(int, y));
|
||||
|
||||
}
|
||||
|
||||
static JNINativeMethod methods[] = {
|
||||
{"touchBegin","(I)V",(void*)touchBegin},
|
||||
{"touchAdd","(IIIZIIFF)V",(void*)touchAdd},
|
||||
|
|
@ -799,7 +824,8 @@ namespace QtAndroidInput
|
|||
{"keyDown", "(IIIZ)V", (void *)keyDown},
|
||||
{"keyUp", "(IIIZ)V", (void *)keyUp},
|
||||
{"keyboardVisibilityChanged", "(Z)V", (void *)keyboardVisibilityChanged},
|
||||
{"keyboardGeometryChanged", "(IIII)V", (void *)keyboardGeometryChanged}
|
||||
{"keyboardGeometryChanged", "(IIII)V", (void *)keyboardGeometryChanged},
|
||||
{"handleLocationChanged", "(III)V", (void *)handleLocationChanged}
|
||||
};
|
||||
|
||||
bool registerNatives(JNIEnv *env)
|
||||
|
|
|
|||
|
|
@ -56,6 +56,9 @@ namespace QtAndroidInput
|
|||
void updateSelection(int selStart, int selEnd, int candidatesStart, int candidatesEnd);
|
||||
// Software keyboard support
|
||||
|
||||
// cursor/selection handles
|
||||
void updateHandles(int handleCount, QPoint cursor = QPoint(), QPoint anchor = QPoint());
|
||||
|
||||
bool registerNatives(JNIEnv *env);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Copyright (C) 2012 BogDan Vatra <bogdan@kde.org>
|
||||
** Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the plugins of the Qt Toolkit.
|
||||
|
|
@ -342,9 +343,28 @@ static JNINativeMethod methods[] = {
|
|||
{"updateCursorPosition", "()Z", (void *)updateCursorPosition}
|
||||
};
|
||||
|
||||
static QRect inputItemRectangle()
|
||||
{
|
||||
QRectF itemRect = qGuiApp->inputMethod()->inputItemRectangle();
|
||||
QRect rect = qGuiApp->inputMethod()->inputItemTransform().mapRect(itemRect).toRect();
|
||||
QWindow *window = qGuiApp->focusWindow();
|
||||
if (window)
|
||||
rect = QRect(window->mapToGlobal(rect.topLeft()), rect.size());
|
||||
double pixelDensity = window
|
||||
? QHighDpiScaling::factor(window)
|
||||
: QHighDpiScaling::factor(QtAndroid::androidPlatformIntegration()->screen());
|
||||
if (pixelDensity != 1.0) {
|
||||
rect.setX(rect.x() * pixelDensity);
|
||||
rect.setY(rect.y() * pixelDensity);
|
||||
rect.setWidth(rect.width() * pixelDensity);
|
||||
rect.setHeight(rect.height() * pixelDensity);
|
||||
}
|
||||
return rect;
|
||||
}
|
||||
|
||||
QAndroidInputContext::QAndroidInputContext()
|
||||
: QPlatformInputContext(), m_composingTextStart(-1), m_blockUpdateSelection(false), m_batchEditNestingLevel(0), m_focusObject(0)
|
||||
: QPlatformInputContext(), m_composingTextStart(-1), m_blockUpdateSelection(false),
|
||||
m_cursorHandleShown(CursorHandleNotShown), m_batchEditNestingLevel(0), m_focusObject(0)
|
||||
{
|
||||
jclass clazz = QJNIEnvironmentPrivate::findClass(QtNativeInputConnectionClassName);
|
||||
if (Q_UNLIKELY(!clazz)) {
|
||||
|
|
@ -415,6 +435,9 @@ QAndroidInputContext::QAndroidInputContext()
|
|||
qRegisterMetaType<QInputMethodEvent *>("QInputMethodEvent*");
|
||||
qRegisterMetaType<QInputMethodQueryEvent *>("QInputMethodQueryEvent*");
|
||||
m_androidInputContext = this;
|
||||
|
||||
QObject::connect(QGuiApplication::inputMethod(), &QInputMethod::cursorRectangleChanged,
|
||||
this, &QAndroidInputContext::updateSelectionHandles);
|
||||
}
|
||||
|
||||
QAndroidInputContext::~QAndroidInputContext()
|
||||
|
|
@ -452,6 +475,7 @@ void QAndroidInputContext::reset()
|
|||
{
|
||||
clear();
|
||||
m_batchEditNestingLevel = 0;
|
||||
m_cursorHandleShown = QAndroidInputContext::CursorHandleNotShown;
|
||||
if (qGuiApp->focusObject()) {
|
||||
QSharedPointer<QInputMethodQueryEvent> query = focusObjectInputMethodQueryThreadSafe(Qt::ImEnabled);
|
||||
if (!query.isNull() && query->value(Qt::ImEnabled).toBool()) {
|
||||
|
|
@ -500,6 +524,103 @@ void QAndroidInputContext::updateCursorPosition()
|
|||
}
|
||||
}
|
||||
|
||||
void QAndroidInputContext::updateSelectionHandles()
|
||||
{
|
||||
auto im = qGuiApp->inputMethod();
|
||||
if (!m_focusObject || (m_cursorHandleShown == CursorHandleNotShown)) {
|
||||
// Hide the handles
|
||||
QtAndroidInput::updateHandles(0);
|
||||
return;
|
||||
}
|
||||
QWindow *window = qGuiApp->focusWindow();
|
||||
double pixelDensity = window
|
||||
? QHighDpiScaling::factor(window)
|
||||
: QHighDpiScaling::factor(QtAndroid::androidPlatformIntegration()->screen());
|
||||
|
||||
QInputMethodQueryEvent query(Qt::ImCursorPosition | Qt::ImAnchorPosition | Qt::ImEnabled);
|
||||
QCoreApplication::sendEvent(m_focusObject, &query);
|
||||
int cpos = query.value(Qt::ImCursorPosition).toInt();
|
||||
int anchor = query.value(Qt::ImAnchorPosition).toInt();
|
||||
|
||||
if (cpos == anchor || im->anchorRectangle().isNull()) {
|
||||
if (!query.value(Qt::ImEnabled).toBool()) {
|
||||
QtAndroidInput::updateHandles(0);
|
||||
return;
|
||||
}
|
||||
|
||||
auto curRect = im->cursorRectangle();
|
||||
QPoint cursorPoint(curRect.center().x(), curRect.bottom());
|
||||
QtAndroidInput::updateHandles(m_cursorHandleShown, cursorPoint * pixelDensity);
|
||||
return;
|
||||
}
|
||||
|
||||
auto leftRect = im->cursorRectangle();
|
||||
auto rightRect = im->anchorRectangle();
|
||||
if (cpos > anchor)
|
||||
std::swap(leftRect, rightRect);
|
||||
|
||||
QPoint leftPoint(leftRect.bottomLeft().toPoint() * pixelDensity);
|
||||
QPoint righPoint(rightRect.bottomRight().toPoint() * pixelDensity);
|
||||
QtAndroidInput::updateHandles(CursorHandleShowSelection, leftPoint, righPoint);
|
||||
}
|
||||
|
||||
/*
|
||||
Called from Java when a cursor/selection handle was dragged to a new position
|
||||
|
||||
handleId of 1 means the cursor handle, 2 means the left handle, 3 means the right handle
|
||||
*/
|
||||
void QAndroidInputContext::handleLocationChanged(int handleId, int x, int y)
|
||||
{
|
||||
auto im = qGuiApp->inputMethod();
|
||||
auto leftRect = im->cursorRectangle();
|
||||
// The handle is down of the cursor, but we want the position in the middle.
|
||||
QWindow *window = qGuiApp->focusWindow();
|
||||
double pixelDensity = window
|
||||
? QHighDpiScaling::factor(window)
|
||||
: QHighDpiScaling::factor(QtAndroid::androidPlatformIntegration()->screen());
|
||||
QPoint point(x / pixelDensity, y / pixelDensity);
|
||||
y -= leftRect.width() / 2;
|
||||
if (handleId == 1) {
|
||||
setSelectionOnFocusObject(point, point);
|
||||
return;
|
||||
}
|
||||
|
||||
QInputMethodQueryEvent query(Qt::ImCursorPosition | Qt::ImAnchorPosition);
|
||||
QCoreApplication::sendEvent(m_focusObject, &query);
|
||||
int cpos = query.value(Qt::ImCursorPosition).toInt();
|
||||
int anchor = query.value(Qt::ImAnchorPosition).toInt();
|
||||
|
||||
auto rightRect = im->anchorRectangle();
|
||||
if (cpos > anchor)
|
||||
std::swap(leftRect, rightRect);
|
||||
|
||||
if (handleId == 2) {
|
||||
QPoint rightPoint(rightRect.center().toPoint());
|
||||
setSelectionOnFocusObject(point, rightPoint);
|
||||
} else if (handleId == 3) {
|
||||
QPoint leftPoint(leftRect.center().toPoint());
|
||||
setSelectionOnFocusObject(leftPoint, point);
|
||||
}
|
||||
}
|
||||
|
||||
void QAndroidInputContext::touchDown(int x, int y)
|
||||
{
|
||||
if (m_focusObject && inputItemRectangle().contains(x, y) && !m_cursorHandleShown) {
|
||||
// If the user touch the input rectangle, we can show the cursor handle
|
||||
m_cursorHandleShown = QAndroidInputContext::CursorHandleShowNormal;
|
||||
updateSelectionHandles();
|
||||
}
|
||||
}
|
||||
|
||||
void QAndroidInputContext::keyDown()
|
||||
{
|
||||
if (m_cursorHandleShown) {
|
||||
// When the user enter text on the keyboard, we hide the cursor handle
|
||||
m_cursorHandleShown = QAndroidInputContext::CursorHandleNotShown;
|
||||
updateSelectionHandles();
|
||||
}
|
||||
}
|
||||
|
||||
void QAndroidInputContext::update(Qt::InputMethodQueries queries)
|
||||
{
|
||||
QSharedPointer<QInputMethodQueryEvent> query = focusObjectInputMethodQueryThreadSafe(queries);
|
||||
|
|
@ -543,22 +664,11 @@ void QAndroidInputContext::showInputPanel()
|
|||
m_updateCursorPosConnection = connect(qGuiApp->focusObject(), SIGNAL(cursorPositionChanged(int,int)), this, SLOT(updateCursorPosition()));
|
||||
else
|
||||
m_updateCursorPosConnection = connect(qGuiApp->focusObject(), SIGNAL(cursorPositionChanged()), this, SLOT(updateCursorPosition()));
|
||||
QRectF itemRect = qGuiApp->inputMethod()->inputItemRectangle();
|
||||
QRect rect = qGuiApp->inputMethod()->inputItemTransform().mapRect(itemRect).toRect();
|
||||
QWindow *window = qGuiApp->focusWindow();
|
||||
if (window)
|
||||
rect = QRect(window->mapToGlobal(rect.topLeft()), rect.size());
|
||||
|
||||
double pixelDensity = window ? QHighDpiScaling::factor(window)
|
||||
: QHighDpiScaling::factor(QtAndroid::androidPlatformIntegration()->screen());
|
||||
|
||||
QtAndroidInput::showSoftwareKeyboard(rect.left() * pixelDensity,
|
||||
rect.top() * pixelDensity,
|
||||
rect.width() * pixelDensity,
|
||||
rect.height() * pixelDensity,
|
||||
QRect rect = inputItemRectangle();
|
||||
QtAndroidInput::showSoftwareKeyboard(rect.left(), rect.top(), rect.width(), rect.height(),
|
||||
query->value(Qt::ImHints).toUInt(),
|
||||
query->value(Qt::ImEnterKeyType).toUInt()
|
||||
);
|
||||
query->value(Qt::ImEnterKeyType).toUInt());
|
||||
}
|
||||
|
||||
void QAndroidInputContext::showInputPanelLater(Qt::ApplicationState state)
|
||||
|
|
@ -601,6 +711,7 @@ void QAndroidInputContext::setFocusObject(QObject *object)
|
|||
reset();
|
||||
}
|
||||
QPlatformInputContext::setFocusObject(object);
|
||||
updateSelectionHandles();
|
||||
}
|
||||
|
||||
jboolean QAndroidInputContext::beginBatchEdit()
|
||||
|
|
@ -858,6 +969,8 @@ jboolean QAndroidInputContext::setComposingText(const QString &text, jint newCur
|
|||
QInputMethodEvent event(m_composingText, attributes);
|
||||
sendInputMethodEventThreadSafe(&event);
|
||||
|
||||
QMetaObject::invokeMethod(this, "keyDown");
|
||||
|
||||
updateCursorPosition();
|
||||
|
||||
return JNI_TRUE;
|
||||
|
|
@ -979,20 +1092,21 @@ jboolean QAndroidInputContext::setSelection(jint start, jint end)
|
|||
|
||||
jboolean QAndroidInputContext::selectAll()
|
||||
{
|
||||
#warning TODO
|
||||
return JNI_FALSE;
|
||||
sendShortcut(QKeySequence::SelectAll);
|
||||
return JNI_TRUE;
|
||||
}
|
||||
|
||||
jboolean QAndroidInputContext::cut()
|
||||
{
|
||||
#warning TODO
|
||||
return JNI_FALSE;
|
||||
m_cursorHandleShown = CursorHandleNotShown;
|
||||
sendShortcut(QKeySequence::Cut);
|
||||
return JNI_TRUE;
|
||||
}
|
||||
|
||||
jboolean QAndroidInputContext::copy()
|
||||
{
|
||||
#warning TODO
|
||||
return JNI_FALSE;
|
||||
sendShortcut(QKeySequence::Copy);
|
||||
return JNI_TRUE;
|
||||
}
|
||||
|
||||
jboolean QAndroidInputContext::copyURL()
|
||||
|
|
@ -1003,10 +1117,21 @@ jboolean QAndroidInputContext::copyURL()
|
|||
|
||||
jboolean QAndroidInputContext::paste()
|
||||
{
|
||||
#warning TODO
|
||||
return JNI_FALSE;
|
||||
m_cursorHandleShown = CursorHandleNotShown;
|
||||
sendShortcut(QKeySequence::Paste);
|
||||
return JNI_TRUE;
|
||||
}
|
||||
|
||||
void QAndroidInputContext::sendShortcut(const QKeySequence &sequence)
|
||||
{
|
||||
for (int i = 0; i < sequence.count(); ++i) {
|
||||
const int keys = sequence[i];
|
||||
Qt::Key key = Qt::Key(keys & ~Qt::KeyboardModifierMask);
|
||||
Qt::KeyboardModifiers mod = Qt::KeyboardModifiers(keys & Qt::KeyboardModifierMask);
|
||||
QGuiApplication::postEvent(m_focusObject, new QKeyEvent(QEvent::KeyPress, key, mod));
|
||||
QGuiApplication::postEvent(m_focusObject, new QKeyEvent(QEvent::KeyRelease, key, mod));
|
||||
}
|
||||
}
|
||||
|
||||
Q_INVOKABLE QVariant QAndroidInputContext::queryFocusObjectUnsafe(Qt::InputMethodQuery query, QVariant argument)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 BogDan Vatra <bogdan@kde.org>
|
||||
** Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the plugins of the Qt Toolkit.
|
||||
|
|
@ -94,6 +95,7 @@ public:
|
|||
bool isComposing() const;
|
||||
void clear();
|
||||
void setFocusObject(QObject *object);
|
||||
void sendShortcut(const QKeySequence &);
|
||||
|
||||
//---------------//
|
||||
jboolean beginBatchEdit();
|
||||
|
|
@ -117,6 +119,10 @@ public:
|
|||
|
||||
public slots:
|
||||
void updateCursorPosition();
|
||||
void updateSelectionHandles();
|
||||
void handleLocationChanged(int handleId, int x, int y);
|
||||
void touchDown(int x, int y);
|
||||
void keyDown();
|
||||
|
||||
private slots:
|
||||
void showInputPanelLater(Qt::ApplicationState);
|
||||
|
|
@ -138,6 +144,12 @@ private:
|
|||
int m_composingCursor;
|
||||
QMetaObject::Connection m_updateCursorPosConnection;
|
||||
bool m_blockUpdateSelection;
|
||||
enum CursorHandleShowMode {
|
||||
CursorHandleNotShown,
|
||||
CursorHandleShowNormal = 1,
|
||||
CursorHandleShowSelection = 2
|
||||
};
|
||||
CursorHandleShowMode m_cursorHandleShown;
|
||||
int m_batchEditNestingLevel;
|
||||
QObject *m_focusObject;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue