diff options
Diffstat (limited to 'src/pdfquick/qquickpdfselection.cpp')
| -rw-r--r-- | src/pdfquick/qquickpdfselection.cpp | 139 |
1 files changed, 58 insertions, 81 deletions
diff --git a/src/pdfquick/qquickpdfselection.cpp b/src/pdfquick/qquickpdfselection.cpp index 508dc18e8..4776cb8b4 100644 --- a/src/pdfquick/qquickpdfselection.cpp +++ b/src/pdfquick/qquickpdfselection.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtPDF module 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$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qquickpdfselection_p.h" #include "qquickpdfdocument_p.h" @@ -66,7 +30,7 @@ static const QRegularExpression WordDelimiter(QStringLiteral("\\s")); PdfSelection provides the text string and its geometry within a bounding box from one point to another. - To modify the selection using the mouse, bind \l fromPoint and \l toPoint + To modify the selection using the mouse, bind \l from and \l to to the suitable properties of an input handler so that they will be set to the positions where the drag gesture begins and ends, respectively; and bind the \l hold property so that it will be set to \c true during the drag @@ -82,8 +46,6 @@ QQuickPdfSelection::QQuickPdfSelection(QQuickItem *parent) { #if QT_CONFIG(im) setFlags(ItemIsFocusScope | ItemAcceptsInputMethod); - // workaround to get Copy instead of Paste on the popover menu (QTBUG-83811) - setProperty("qt_im_readonly", QVariant(true)); #endif } @@ -132,8 +94,8 @@ void QQuickPdfSelection::setDocument(QQuickPdfDocument *document) PdfSelection { id: selection document: doc - fromPoint: textSelectionDrag.centroid.pressPosition - toPoint: textSelectionDrag.centroid.position + from: textSelectionDrag.centroid.pressPosition + to: textSelectionDrag.centroid.position hold: !textSelectionDrag.active } Shape { @@ -165,16 +127,16 @@ QList<QPolygonF> QQuickPdfSelection::geometry() const void QQuickPdfSelection::clear() { m_hitPoint = QPointF(); - m_fromPoint = QPointF(); - m_toPoint = QPointF(); + m_from = QPointF(); + m_to = QPointF(); m_heightAtAnchor = 0; m_heightAtCursor = 0; m_fromCharIndex = -1; m_toCharIndex = -1; m_text.clear(); m_geometry.clear(); - emit fromPointChanged(); - emit toPointChanged(); + emit fromChanged(); + emit toChanged(); emit textChanged(); emit selectedAreaChanged(); QGuiApplication::inputMethod()->update(Qt::ImQueryInput); @@ -187,6 +149,8 @@ void QQuickPdfSelection::clear() */ void QQuickPdfSelection::selectAll() { + if (!m_document) + return; QPdfSelection sel = m_document->document()->getAllText(m_page); if (sel.text() != m_text) { m_text = sel.text(); @@ -203,11 +167,11 @@ void QQuickPdfSelection::selectAll() m_fromCharIndex = sel.startIndex(); m_toCharIndex = sel.endIndex(); if (sel.bounds().isEmpty()) { - m_fromPoint = QPointF(); - m_toPoint = QPointF(); + m_from = QPointF(); + m_to = QPointF(); } else { - m_fromPoint = sel.bounds().first().boundingRect().topLeft() * m_renderScale; - m_toPoint = sel.bounds().last().boundingRect().bottomRight() * m_renderScale - QPointF(0, m_heightAtCursor); + m_from = sel.bounds().first().boundingRect().topLeft() * m_renderScale; + m_to = sel.bounds().last().boundingRect().bottomRight() * m_renderScale - QPointF(0, m_heightAtCursor); } QGuiApplication::inputMethod()->update(Qt::ImCursorRectangle | Qt::ImAnchorRectangle); @@ -220,21 +184,25 @@ void QQuickPdfSelection::keyReleaseEvent(QKeyEvent *ev) qCDebug(qLcIm) << "release" << ev; const auto &allText = pageText(); if (ev == QKeySequence::MoveToPreviousWord) { + if (!m_document) + return; // iOS sends MoveToPreviousWord first to get to the beginning of the word, // and then SelectNextWord to select the whole word. - int i = allText.lastIndexOf(WordDelimiter, m_fromCharIndex - allText.length()); + int i = allText.lastIndexOf(WordDelimiter, m_fromCharIndex - allText.size()); if (i < 0) i = 0; else i += 1; // don't select the space before the word - auto sel = m_document->document()->getSelectionAtIndex(m_page, i, m_text.length() + m_fromCharIndex - i); + auto sel = m_document->document()->getSelectionAtIndex(m_page, i, m_text.size() + m_fromCharIndex - i); update(sel); QGuiApplication::inputMethod()->update(Qt::ImAnchorRectangle); } else if (ev == QKeySequence::SelectNextWord) { + if (!m_document) + return; int i = allText.indexOf(WordDelimiter, m_toCharIndex); if (i < 0) - i = allText.length(); // go to the end of m_textAfter - auto sel = m_document->document()->getSelectionAtIndex(m_page, m_fromCharIndex, m_text.length() + i - m_toCharIndex); + i = allText.size(); // go to the end of m_textAfter + auto sel = m_document->document()->getSelectionAtIndex(m_page, m_fromCharIndex, m_text.size() + i - m_toCharIndex); update(sel); QGuiApplication::inputMethod()->update(Qt::ImCursorRectangle); } else if (ev == QKeySequence::Copy) { @@ -250,6 +218,8 @@ void QQuickPdfSelection::inputMethodEvent(QInputMethodEvent *event) qCDebug(qLcIm) << "QInputMethodEvent::Cursor: moved to" << attr.start << "len" << attr.length; break; case QInputMethodEvent::Selection: { + if (!m_document) + return; auto sel = m_document->document()->getSelectionAtIndex(m_page, attr.start, attr.length); update(sel); qCDebug(qLcIm) << "QInputMethodEvent::Selection: from" << attr.start << "len" << attr.length @@ -271,6 +241,8 @@ QVariant QQuickPdfSelection::inputMethodQuery(Qt::InputMethodQuery query, const if (!argument.isNull()) { qCDebug(qLcIm) << "IM query" << query << "with arg" << argument; if (query == Qt::ImCursorPosition) { + if (!m_document) + return {}; // If it didn't move since last time, return the same result. if (m_hitPoint == argument.toPointF()) return inputMethodQuery(query); @@ -280,7 +252,7 @@ QVariant QQuickPdfSelection::inputMethodQuery(Qt::InputMethodQuery query, const << "got char index" << tp.charIndex << "@" << tp.position << "pt," << tp.position * m_renderScale << "px"; if (tp.charIndex >= 0) { m_toCharIndex = tp.charIndex; - m_toPoint = tp.position * m_renderScale - QPointF(0, m_heightAtCursor); + m_to = tp.position * m_renderScale - QPointF(0, m_heightAtCursor); m_heightAtCursor = tp.height * m_renderScale; if (qFuzzyIsNull(m_heightAtAnchor)) m_heightAtAnchor = m_heightAtCursor; @@ -313,10 +285,10 @@ QVariant QQuickPdfSelection::inputMethodQuery(Qt::InputMethodQuery query) const ret = m_toCharIndex; break; case Qt::ImAnchorRectangle: - ret = QRectF(m_fromPoint, QSizeF(1, m_heightAtAnchor)); + ret = QRectF(m_from, QSizeF(1, m_heightAtAnchor)); break; case Qt::ImCursorRectangle: - ret = QRectF(m_toPoint, QSizeF(1, m_heightAtCursor)); + ret = QRectF(m_to, QSizeF(1, m_heightAtCursor)); break; case Qt::ImSurroundingText: ret = QVariant(pageText()); @@ -345,6 +317,7 @@ QVariant QQuickPdfSelection::inputMethodQuery(Qt::InputMethodQuery query) const case Qt::ImPlatformData: break; case Qt::ImReadOnly: + ret = true; break; case Qt::ImQueryInput: case Qt::ImQueryAll: @@ -359,6 +332,8 @@ QVariant QQuickPdfSelection::inputMethodQuery(Qt::InputMethodQuery query) const const QString &QQuickPdfSelection::pageText() const { if (m_pageTextDirty) { + if (!m_document) + return m_pageText; m_pageText = m_document->document()->getAllText(m_page).text(); m_pageTextDirty = false; } @@ -369,8 +344,8 @@ void QQuickPdfSelection::resetPoints() { bool wasHolding = m_hold; m_hold = false; - setFromPoint(QPointF()); - setToPoint(QPointF()); + setFrom(QPointF()); + setTo(QPointF()); m_hold = wasHolding; } @@ -401,7 +376,7 @@ void QQuickPdfSelection::setPage(int page) \qmlproperty real PdfSelection::renderScale \brief The ratio from points to pixels at which the page is rendered. - This is used to scale \l fromPoint and \l toPoint to find ranges of + This is used to scale \l from and \l to to find ranges of selected characters in the document, because positions within the document are always given in points. */ @@ -426,7 +401,7 @@ void QQuickPdfSelection::setRenderScale(qreal scale) } /*! - \qmlproperty point PdfSelection::fromPoint + \qmlproperty point PdfSelection::from The beginning location, in pixels from the upper-left corner of the page, from which to find selected text. This can be bound to the @@ -434,41 +409,41 @@ void QQuickPdfSelection::setRenderScale(qreal scale) the position where the user presses the mouse button and begins dragging, for example. */ -QPointF QQuickPdfSelection::fromPoint() const +QPointF QQuickPdfSelection::from() const { - return m_fromPoint; + return m_from; } -void QQuickPdfSelection::setFromPoint(QPointF fromPoint) +void QQuickPdfSelection::setFrom(QPointF from) { - if (m_hold || m_fromPoint == fromPoint) + if (m_hold || m_from == from) return; - m_fromPoint = fromPoint; - emit fromPointChanged(); + m_from = from; + emit fromChanged(); updateResults(); } /*! - \qmlproperty point PdfSelection::toPoint + \qmlproperty point PdfSelection::to The ending location, in pixels from the upper-left corner of the page, from which to find selected text. This can be bound to the \c centroid.position of a \l DragHandler to end selection of text at the position where the user is currently dragging the mouse, for example. */ -QPointF QQuickPdfSelection::toPoint() const +QPointF QQuickPdfSelection::to() const { - return m_toPoint; + return m_to; } -void QQuickPdfSelection::setToPoint(QPointF toPoint) +void QQuickPdfSelection::setTo(QPointF to) { - if (m_hold || m_toPoint == toPoint) + if (m_hold || m_to == to) return; - m_toPoint = toPoint; - emit toPointChanged(); + m_to = to; + emit toChanged(); updateResults(); } @@ -476,7 +451,7 @@ void QQuickPdfSelection::setToPoint(QPointF toPoint) \qmlproperty bool PdfSelection::hold Controls whether to hold the existing selection regardless of changes to - \l fromPoint and \l toPoint. This property can be set to \c true when the mouse + \l from and \l to. This property can be set to \c true when the mouse or touchpoint is released, so that the selection is not lost due to the point bindings changing. */ @@ -521,7 +496,7 @@ void QQuickPdfSelection::updateResults() if (!m_document) return; QPdfSelection sel = m_document->document()->getSelection(m_page, - m_fromPoint / m_renderScale, m_toPoint / m_renderScale); + m_from / m_renderScale, m_to / m_renderScale); update(sel, true); } @@ -545,12 +520,12 @@ void QQuickPdfSelection::update(const QPdfSelection &sel, bool textAndGeometryOn m_fromCharIndex = sel.startIndex(); m_toCharIndex = sel.endIndex(); if (sel.bounds().isEmpty()) { - m_fromPoint = sel.boundingRectangle().topLeft() * m_renderScale; - m_toPoint = m_fromPoint; + m_from = sel.boundingRectangle().topLeft() * m_renderScale; + m_to = m_from; } else { Qt::InputMethodQueries toUpdate = {}; QRectF firstLineBounds = sel.bounds().first().boundingRect(); - m_fromPoint = firstLineBounds.topLeft() * m_renderScale; + m_from = firstLineBounds.topLeft() * m_renderScale; if (!qFuzzyCompare(m_heightAtAnchor, firstLineBounds.height())) { m_heightAtAnchor = firstLineBounds.height() * m_renderScale; toUpdate.setFlag(Qt::ImAnchorRectangle); @@ -560,10 +535,12 @@ void QQuickPdfSelection::update(const QPdfSelection &sel, bool textAndGeometryOn m_heightAtCursor = lastLineBounds.height() * m_renderScale; toUpdate.setFlag(Qt::ImCursorRectangle); } - m_toPoint = lastLineBounds.topRight() * m_renderScale; + m_to = lastLineBounds.topRight() * m_renderScale; if (toUpdate) QGuiApplication::inputMethod()->update(toUpdate); } } QT_END_NAMESPACE + +#include "moc_qquickpdfselection_p.cpp" |