office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-07-05 00:58:46 +00:00
Code Issues Projects Releases Wiki Activity

Fix multiline selection

Browse Source 
In qt6, QRect::normalized changed it's meaning and it now has a 'span'
that preserves the old meaning.

Use the old span to get the old version of normalized so we can match on
the corners once again.

see https://codereview.qt-project.org/c/qt/qtbase/+/309932 for details.

BUG: 482249
This commit is contained in:
Sune Vuorela 2024-03-05 21:07:10 +00:00 committed by Albert Astals Cid
parent 7f639c2826
commit 717751a1f1
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
autotests/parttest.cpp
View File

@ -68,6 +68,7 @@ private Q_SLOTS:
void testForwardPDF_data();
void testGeneratorPreferences();
void testSelectText();
void testSelectTextMultiline();
void testClickInternalLink();
void testScrollBarAndMouseWheel();
void testOpenUrlArguments();
@ -294,6 +295,67 @@ void PartTest::testSelectText()
QCOMPARE(QApplication::clipboard()->text(), QStringLiteral("Hola que tal"));
}
void PartTest::testSelectTextMultiline()
{
// This test tests a specific variation of multiline selection
// Select from middle to end of line, then continue to select next line
// then move selection back on next line past the point of the first line
// https://bugs.kde.org/show_bug.cgi?id=482249 has a nice animation.
QVariantList dummyArgs;
Okular::Part part(nullptr, dummyArgs);
QVERIFY(openDocument(&part, QStringLiteral(KDESRCDIR "data/file2.pdf")));
part.widget()->show();
QVERIFY(QTest::qWaitForWindowExposed(part.widget()));
part.m_document->setViewportPage(1);
// wait for pixmap
QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView));
const int width = part.m_pageView->horizontalScrollBar()->maximum() + part.m_pageView->viewport()->width();
const int height = part.m_pageView->verticalScrollBar()->maximum() + part.m_pageView->viewport()->height();
QVERIFY(QMetaObject::invokeMethod(part.m_pageView, "slotSetMouseTextSelect"));
const int startY = height * 0.052;
const int startX = width * 0.22;
const int endY = height * 0.072;
const int endX = width * 0.6;
const int steps = 5;
const double diffX = endX - startX;
const double diffXStep = diffX / steps;
QTestEventList events;
events.addMouseMove(QPoint(startX, startY));
events.addMousePress(Qt::LeftButton, Qt::NoModifier, QPoint(startX, startY));
for (int i = 0; i < steps - 1; ++i) {
events.addMouseMove(QPoint(startX + i * diffXStep, startY));
events.addDelay(100);
}
events.addMouseMove(QPoint(endX, startY));
events.addDelay(100);
events.addMouseMove(QPoint(endX, endY));
events.addDelay(100);
for (int i = 0; i < (steps); i++) {
events.addMouseMove(QPoint(endX - (i * diffXStep), endY));
events.addDelay(100);
}
events.addMouseMove(QPoint(endX - (diffXStep * (steps)), endY));
events.addDelay(100);
events.addMouseMove(QPoint(endX - (diffXStep * (steps + 0.5)), endY));
events.addDelay(100);
events.addMouseRelease(Qt::LeftButton, Qt::NoModifier, QPoint(endX - (diffXStep * (steps + 0.5)), endY));
events.simulate(part.m_pageView->viewport());
QApplication::clipboard()->clear();
QVERIFY(QMetaObject::invokeMethod(part.m_pageView, "copyTextSelection"));
QCOMPARE(QApplication::clipboard()->text(), QStringLiteral("cks!\nOf c"));
}
void PartTest::testClickInternalLink()
{
QVariantList dummyArgs;

2
part/pageview.cpp
View File

@ -3385,7 +3385,7 @@ QList<Okular::RegularAreaRect *> PageView::textSelections(const QPoint start, co
firstpage = -1;
QList<Okular::RegularAreaRect *> ret;
QSet<int> affectedItemsSet;
QRect selectionRect = QRect(start, end).normalized();
QRect selectionRect = QRect::span(start, end);
for (const PageViewItem *item : std::as_const(d->items)) {
if (item->isVisible() && selectionRect.intersects(item->croppedGeometry())) {
affectedItemsSet.insert(item->pageNumber());