From 608243e0b34f2ea5c54d65ec193326ee0c74e275 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Wed, 27 Apr 2016 21:01:13 +0200
Subject: [PATCH] Fix relative position with qt5.7

---
 messageviewer/src/viewer/viewer_p.h                      | 2 +-
 messageviewer/src/viewer/webengine/mailwebengineview.cpp | 8 +++++---
 messageviewer/src/viewer/webengine/mailwebengineview.h   | 4 ++--
 webengineviewer/src/webenginescript.cpp                  | 2 +-
 webengineviewer/src/webenginescript.h                    | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/messageviewer/src/viewer/viewer_p.h b/messageviewer/src/viewer/viewer_p.h
index d40a052c..a9f7f4cc 100644
--- a/messageviewer/src/viewer/viewer_p.h
+++ b/messageviewer/src/viewer/viewer_p.h
@@ -652,7 +652,7 @@ public:
       in printMsg() and slotPrintMsg() since mHtmlWriter points only to abstract non-QObject class. */
     QPointer<WebEnginePartHtmlWriter> mPartHtmlWriter;
 
-    float mSavedRelativePosition;
+    qreal mSavedRelativePosition;
     int mLevelQuote;
     bool mDecrytMessageOverwrite;
     bool mShowSignatureDetails;
diff --git a/messageviewer/src/viewer/webengine/mailwebengineview.cpp b/messageviewer/src/viewer/webengine/mailwebengineview.cpp
index b58097e1..45ada03a 100644
--- a/messageviewer/src/viewer/webengine/mailwebengineview.cpp
+++ b/messageviewer/src/viewer/webengine/mailwebengineview.cpp
@@ -302,14 +302,16 @@ bool MailWebEngineView::isAttachmentInjectionPoint(const QPoint &globalPos) cons
     return false;
 }
 
-void MailWebEngineView::scrollToRelativePosition(double pos)
+void MailWebEngineView::scrollToRelativePosition(qreal pos)
 {
     page()->runJavaScript(WebEngineViewer::WebEngineScript::scrollToRelativePosition(pos));
 }
 
-double MailWebEngineView::relativePosition() const
+qreal MailWebEngineView::relativePosition() const
 {
-
+#if QT_VERSION >= 0x050700
+    return page()->scrollPosition().toPoint().y();
+#endif
     qDebug() << "double MailWebEngineView::relativePosition() const not implemented";
     //TODO
     return {};
diff --git a/messageviewer/src/viewer/webengine/mailwebengineview.h b/messageviewer/src/viewer/webengine/mailwebengineview.h
index 9a5b6abe..6075979a 100644
--- a/messageviewer/src/viewer/webengine/mailwebengineview.h
+++ b/messageviewer/src/viewer/webengine/mailwebengineview.h
@@ -55,8 +55,8 @@ public:
 
     bool hasVerticalScrollBar() const;
     bool isAttachmentInjectionPoint(const QPoint &globalPos) const;
-    void scrollToRelativePosition(double pos);
-    double relativePosition() const;
+    void scrollToRelativePosition(qreal pos);
+    qreal relativePosition() const;
     QUrl linkOrImageUrlAt(const QPoint &global) const;
 
     void setAllowExternalContent(bool b);
diff --git a/webengineviewer/src/webenginescript.cpp b/webengineviewer/src/webenginescript.cpp
index ccb0a249..755aea5f 100644
--- a/webengineviewer/src/webenginescript.cpp
+++ b/webengineviewer/src/webenginescript.cpp
@@ -174,7 +174,7 @@ QString WebEngineScript::setStyleToElement(const QString &elementStr, const QStr
     return source;
 }
 
-QString WebEngineScript::scrollToRelativePosition(int pos)
+QString WebEngineScript::scrollToRelativePosition(qreal pos)
 {
     //TODO verify it
     const QString source = QString::fromLatin1("window.scrollTo(window.scrollX, %1); [window.scrollX, window.scrollY];").arg(pos);
diff --git a/webengineviewer/src/webenginescript.h b/webengineviewer/src/webenginescript.h
index a6d3d733..6e35df0e 100644
--- a/webengineviewer/src/webenginescript.h
+++ b/webengineviewer/src/webenginescript.h
@@ -36,7 +36,7 @@ WEBENGINEVIEWER_EXPORT QString setStyleToElement(const QString &elementStr, cons
 WEBENGINEVIEWER_EXPORT QString scrollDown(int pixel);
 WEBENGINEVIEWER_EXPORT QString scrollUp(int pixel);
 WEBENGINEVIEWER_EXPORT QString scrollPercentage(int percent);
-WEBENGINEVIEWER_EXPORT QString scrollToRelativePosition(int pos);
+WEBENGINEVIEWER_EXPORT QString scrollToRelativePosition(qreal pos);
 WEBENGINEVIEWER_EXPORT QString removeStyleToElement(const QString &element);
 WEBENGINEVIEWER_EXPORT QString clearSelection();
 }
-- 
GitLab