diff options
Diffstat (limited to 'src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp')
| -rw-r--r-- | src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp | 68 |
1 files changed, 36 insertions, 32 deletions
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp index fb65b29e..1da578d3 100644 --- a/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp @@ -1,40 +1,16 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtVirtualKeyboard/qvirtualkeyboardinputcontext.h> #include <QtVirtualKeyboard/private/qvirtualkeyboardinputcontext_p.h> #include <QtVirtualKeyboard/private/shifthandler_p.h> #include <QtVirtualKeyboard/private/platforminputcontext_p.h> #include <QtVirtualKeyboard/private/virtualkeyboarddebug_p.h> +#include <QtVirtualKeyboard/qvirtualkeyboardobserver.h> #include <QTextFormat> #include <QGuiApplication> +#include <QtGui/private/qhighdpiscaling_p.h> QT_BEGIN_NAMESPACE using namespace QtVirtualKeyboard; @@ -43,7 +19,7 @@ using namespace QtVirtualKeyboard; \qmltype InputContext \instantiates QVirtualKeyboardInputContext \inqmlmodule QtQuick.VirtualKeyboard - \ingroup qtvirtualkeyboard-qml + \ingroup qtvirtualkeyboard-internal-qml \brief Provides access to an input context. The InputContext can be accessed as singleton instance. @@ -52,6 +28,7 @@ using namespace QtVirtualKeyboard; /*! \class QVirtualKeyboardInputContext \inmodule QtVirtualKeyboard + \ingroup qtvirtualkeyboard-cpp-for-devs \brief Provides access to an input context. */ @@ -131,7 +108,7 @@ void QVirtualKeyboardInputContext::setPreeditText(const QString &text, QList<QIn if (!d->testAttribute(attributes, QInputMethodEvent::TextFormat)) { QTextCharFormat textFormat; textFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline); - attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, 0, text.length(), textFormat)); + attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, 0, text.size(), textFormat)); } } else if (d->_forceCursorPosition != -1) { d->addSelectionAttribute(attributes); @@ -208,7 +185,7 @@ QVirtualKeyboardInputEngine *QVirtualKeyboardInputContext::inputEngine() const /*! \qmlmethod void InputContext::sendKeyClick(int key, string text, int modifiers = 0) - Sends a key click event with the given \a key, \a text and \e modifiers to + Sends a key click event with the given \a key, \a text and \a modifiers to the input item that currently has focus. */ /*! @@ -231,6 +208,10 @@ void QVirtualKeyboardInputContext::sendKeyClick(int key, const QString &text, in d->setState(QVirtualKeyboardInputContextPrivate::State::KeyEvent); d->platformInputContext->sendKeyEvent(&pressEvent); d->platformInputContext->sendKeyEvent(&releaseEvent); + + if (key == Qt::Key_Return || key == Qt::Key_Enter) + d->maybeCloseOnReturn(); + if (d->activeKeys.isEmpty()) d->clearState(QVirtualKeyboardInputContextPrivate::State::KeyEvent); } else { @@ -336,7 +317,11 @@ void QVirtualKeyboardInputContext::clear() */ void QVirtualKeyboardInputContext::setSelectionOnFocusObject(const QPointF &anchorPos, const QPointF &cursorPos) { - QPlatformInputContext::setSelectionOnFocusObject(anchorPos, cursorPos); + QWindow *window = qApp->focusWindow(); + const QPointF &nativeAnchorPos = QHighDpi::toNativePixels(anchorPos, window); + const QPointF &nativeCursorPos = QHighDpi::toNativePixels(cursorPos, window); + + QPlatformInputContext::setSelectionOnFocusObject(nativeAnchorPos, nativeCursorPos); } /*! @@ -406,6 +391,25 @@ QVirtualKeyboardInputContextPrivate *QVirtualKeyboardInputContext::priv() const } /*! + \property QVirtualKeyboardInputContext::keyboardObserver + \since QtQuick.VirtualKeyboard 6.1 + \brief Holds the keyboard observer object, which can be used to receive + notifications of keyboard change events. +*/ +/*! + \qmlproperty KeyboardObserver InputContext::keyboardObserver + \readonly + \since QtQuick.VirtualKeyboard 6.1 + \brief Holds the keyboard observer object, which can be used to receive + notifications of keyboard change events. +*/ +QVirtualKeyboardObserver *QVirtualKeyboardInputContext::keyboardObserver() const +{ + Q_D(const QVirtualKeyboardInputContext); + return d->keyboardObserver; +} + +/*! \qmlproperty bool InputContext::shift \deprecated |