From 717751a1f1940c39f833fd0ec69fbdc4621e60db Mon Sep 17 00:00:00 2001
From: Sune Vuorela <sune@vuorela.dk>
Date: Tue, 5 Mar 2024 21:07:10 +0000
Subject: [PATCH] Fix multiline selection

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
---
 autotests/parttest.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++
 part/pageview.cpp      |  2 +-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/autotests/parttest.cpp b/autotests/parttest.cpp
index fe3c1df02..40c23ae2f 100644
--- a/autotests/parttest.cpp
+++ b/autotests/parttest.cpp
@@ -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;
diff --git a/part/pageview.cpp b/part/pageview.cpp
index c01c5488c..7b6c56024 100644
--- a/part/pageview.cpp
+++ b/part/pageview.cpp
@@ -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());