Commit 6eb1d4fa authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Use new api

parent cf3bcddc
......@@ -32,7 +32,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR})
find_package(Grantlee5 "5.0" CONFIG REQUIRED)
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(KDEPIMLIBS_LIB_VERSION "5.2.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
......
......@@ -57,7 +57,6 @@ using namespace Akregator;
ArticleViewerWebEngine::ArticleViewerWebEngine(KActionCollection *ac, QWidget *parent)
: WebEngineViewer::WebEngineView(parent),
mActionCollection(ac),
mCurrentPosition(0),
mLastButtonClicked(LeftButton),
mViewerPluginToolManager(Q_NULLPTR)
{
......@@ -229,7 +228,7 @@ void ArticleViewerWebEngine::slotLoadFinished()
void ArticleViewerWebEngine::slotLoadStarted()
{
mWebEngineViewAccessKey->hideAccessKeys();
mCurrentPosition = 0;
clearRelativePosition();
setCursor(Qt::WaitCursor);
}
......@@ -346,19 +345,10 @@ void ArticleViewerWebEngine::setArticleAction(ArticleViewerWebEngine::ArticleAct
Q_EMIT articleAction(type, articleId, feed);
}
void ArticleViewerWebEngine::saveCurrentPosition()
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
mCurrentPosition = page()->scrollPosition().y();
qDebug() << "void ArticleViewerWebEngine::saveCurrentPosition()"<<mCurrentPosition;
#endif
}
void ArticleViewerWebEngine::restoreCurrentPosition()
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
qDebug()<<" void ArticleViewerWebEngine::restoreCurrentPosition()" << mCurrentPosition;
mPageEngine->runJavaScript(WebEngineViewer::WebEngineScript::scrollToRelativePosition(mCurrentPosition));
mPageEngine->runJavaScript(WebEngineViewer::WebEngineScript::scrollToRelativePosition(relativePosition()));
#endif
//TODO
}
......
......@@ -68,7 +68,6 @@ public:
void disableIntroduction();
void setArticleAction(ArticleViewerWebEngine::ArticleAction type, const QString &articleId, const QString &feed);
void saveCurrentPosition();
void restoreCurrentPosition();
void createViewerPluginToolManager(KActionCollection *ac, QWidget *parent);
......@@ -134,7 +133,6 @@ protected:
QList<QAction *> viewerPluginActionList(MessageViewer::ViewerPluginInterface::SpecificFeatureTypes features);
WebEngineViewer::NetworkAccessManagerWebEngine *mNetworkAccessManager;
private:
qreal mCurrentPosition;
MousePressedButtonType mLastButtonClicked;
MessageViewer::ViewerPluginToolManager *mViewerPluginToolManager;
WebEngineViewer::WebEngineAccessKey *mWebEngineViewAccessKey;
......
......@@ -101,7 +101,7 @@ void ArticleViewerWebEngineWidgetNg::slotSpeakText()
void ArticleViewerWebEngineWidgetNg::saveCurrentPosition()
{
mArticleViewerNg->saveCurrentPosition();
mArticleViewerNg->saveRelativePosition();
}
void ArticleViewerWebEngineWidgetNg::restoreCurrentPosition()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment