From bab0140c9f32eb31eba376552b8d170b5e845801 Mon Sep 17 00:00:00 2001 From: Le Tan Date: Fri, 4 May 2018 20:37:40 +0800 Subject: [PATCH] use QWebEnginePage::linkHovered instead --- src/resources/markdown_template.js | 16 ---------------- src/vdocument.cpp | 5 ----- src/vdocument.h | 5 ----- src/vmdtab.cpp | 4 ++-- 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/src/resources/markdown_template.js b/src/resources/markdown_template.js index e8c3d61a..7024f016 100644 --- a/src/resources/markdown_template.js +++ b/src/resources/markdown_template.js @@ -859,7 +859,6 @@ var finishOneAsyncJob = function() { // markdown-specifi handle logics, such as Mermaid, MathJax. var finishLogics = function() { if (asyncJobsCount <= 0) { - hookLinks(); content.finishLogics(); calculateWordCount(); } @@ -1428,18 +1427,3 @@ var setPreviewContent = function(lang, html) { previewDiv.className = ''; } }; - -// Show the href text of a link when mouse is over it. -var showRefInLink = function(e) { - if (typeof content.showHoveredLink != 'undefined') { - content.showHoveredLink(this.href); - } -}; - -var hookLinks = function() { - var As = document.links; - - for (var i = 0; i < As.length; ++i){ - As[i].onmouseover = showRefInLink; - } -}; diff --git a/src/vdocument.cpp b/src/vdocument.cpp index f8d9fbfb..78e812ae 100644 --- a/src/vdocument.cpp +++ b/src/vdocument.cpp @@ -188,8 +188,3 @@ void VDocument::previewCodeBlockCB(int p_id, const QString &p_lang, const QStrin { emit codeBlockPreviewReady(p_id, p_lang, p_html); } - -void VDocument::showHoveredLink(const QString &p_link) -{ - emit linkHovered(p_link); -} diff --git a/src/vdocument.h b/src/vdocument.h index 584d75a6..fc2eecd1 100644 --- a/src/vdocument.h +++ b/src/vdocument.h @@ -112,9 +112,6 @@ public slots: void previewCodeBlockCB(int p_id, const QString &p_lang, const QString &p_html); - // Show @p_link in status line. - void showHoveredLink(const QString &p_link); - signals: void textChanged(const QString &text); @@ -176,8 +173,6 @@ signals: void codeBlockPreviewReady(int p_id, const QString &p_lang, const QString &p_html); - void linkHovered(const QString &p_link); - private: QString m_toc; QString m_header; diff --git a/src/vmdtab.cpp b/src/vmdtab.cpp index deceb36d..66c4fb29 100644 --- a/src/vmdtab.cpp +++ b/src/vmdtab.cpp @@ -411,6 +411,8 @@ void VMdTab::setupMarkdownViewer() m_webViewer->setZoomFactor(g_config->getWebZoomFactor()); connect(page->profile(), &QWebEngineProfile::downloadRequested, this, &VMdTab::handleDownloadRequested); + connect(page, &QWebEnginePage::linkHovered, + this, &VMdTab::statusMessage); // Avoid white flash before loading content. page->setBackgroundColor(Qt::transparent); @@ -457,8 +459,6 @@ void VMdTab::setupMarkdownViewer() emit statusUpdated(info); }); - connect(m_document, &VDocument::linkHovered, - this, &VMdTab::statusMessage); page->setWebChannel(channel);