From 5b8aad9fa24caeb50ff3640d01590a15ee4e23d8 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 18 Apr 2016 18:14:44 +0200 Subject: demobrowser: Fix precision of progress bar rendering MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The progress bar never reached the 100% mark. Change-Id: Id87bdb27f882d0d77ed0ad590e2c2278ce6fba92 Reviewed-by: Michael Brüning --- examples/webenginewidgets/demobrowser/urllineedit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/webenginewidgets') diff --git a/examples/webenginewidgets/demobrowser/urllineedit.cpp b/examples/webenginewidgets/demobrowser/urllineedit.cpp index ad5ec1263..a8b41b963 100644 --- a/examples/webenginewidgets/demobrowser/urllineedit.cpp +++ b/examples/webenginewidgets/demobrowser/urllineedit.cpp @@ -329,7 +329,7 @@ void UrlLineEdit::paintEvent(QPaintEvent *event) QColor loadingColor = QColor(116, 192, 250); painter.setBrush(generateGradient(loadingColor)); painter.setPen(Qt::transparent); - int mid = backgroundRect.width() / 100 * progress; + int mid = backgroundRect.width() / 100.0f * progress; QRect progressRect(backgroundRect.x(), backgroundRect.y(), mid, backgroundRect.height()); painter.drawRect(progressRect); } -- cgit v1.2.3 From 28a2e6b76964845eed7eb4534bf66967c08fef72 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 18 Apr 2016 16:42:24 +0200 Subject: demobrowser: Fix HistoryManager::clear Clear the model before saving. Otherwise the cleared history will appear again after restarting the demobrowser. Change-Id: I79f939c1f1e8ee993127d139cefe7f5818ce593c Reviewed-by: Kai Koehne --- examples/webenginewidgets/demobrowser/history.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/webenginewidgets') diff --git a/examples/webenginewidgets/demobrowser/history.cpp b/examples/webenginewidgets/demobrowser/history.cpp index 99f93c178..615582fe2 100644 --- a/examples/webenginewidgets/demobrowser/history.cpp +++ b/examples/webenginewidgets/demobrowser/history.cpp @@ -216,9 +216,9 @@ void HistoryManager::clear() { m_history.clear(); m_lastSavedUrl = QString(); + emit historyReset(); m_saveTimer->changeOccurred(); m_saveTimer->saveIfNeccessary(); - historyReset(); } void HistoryManager::loadSettings() -- cgit v1.2.3 From 213fbe760b5ecbbaffb383361a054eeb5672538a Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 18 Apr 2016 17:14:40 +0200 Subject: demobrowser: Remove unused loadingUrl Remove the unused m_loadingUrl member. Remove the loadingUrl signal that was forwarded to urlChanged. QWebEngineView already emits urlChanged. There's no need to do this twice. Change-Id: Ib9734c5b1571745f7b82b4e5f2bc92c7f1d8f51c Reviewed-by: Allan Sandfeld Jensen --- examples/webenginewidgets/demobrowser/webview.cpp | 12 ------------ examples/webenginewidgets/demobrowser/webview.h | 6 ------ 2 files changed, 18 deletions(-) (limited to 'examples/webenginewidgets') diff --git a/examples/webenginewidgets/demobrowser/webview.cpp b/examples/webenginewidgets/demobrowser/webview.cpp index 42f725fe8..9feedc0b5 100644 --- a/examples/webenginewidgets/demobrowser/webview.cpp +++ b/examples/webenginewidgets/demobrowser/webview.cpp @@ -96,16 +96,6 @@ BrowserMainWindow *WebPage::mainWindow() return BrowserApplication::instance()->mainWindow(); } -bool WebPage::acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame) -{ - Q_UNUSED(type); - if (isMainFrame) { - m_loadingUrl = url; - emit loadingUrl(m_loadingUrl); - } - return true; -} - bool WebPage::certificateError(const QWebEngineCertificateError &error) { if (error.isOverridable()) { @@ -357,8 +347,6 @@ void WebView::setPage(WebPage *_page) connect(page(), SIGNAL(statusBarMessage(QString)), SLOT(setStatusBarText(QString))); #endif - connect(page(), SIGNAL(loadingUrl(QUrl)), - this, SIGNAL(urlChanged(QUrl))); connect(page(), SIGNAL(iconUrlChanged(QUrl)), this, SLOT(onIconUrlChanged(QUrl))); connect(page(), &WebPage::featurePermissionRequested, this, &WebView::onFeaturePermissionRequested); diff --git a/examples/webenginewidgets/demobrowser/webview.h b/examples/webenginewidgets/demobrowser/webview.h index 6d9cd46ab..c506ec8b9 100644 --- a/examples/webenginewidgets/demobrowser/webview.h +++ b/examples/webenginewidgets/demobrowser/webview.h @@ -55,16 +55,11 @@ QT_END_NAMESPACE class BrowserMainWindow; class WebPage : public QWebEnginePage { Q_OBJECT - -signals: - void loadingUrl(const QUrl &url); - public: WebPage(QWebEngineProfile *profile, QObject *parent = 0); BrowserMainWindow *mainWindow(); protected: - bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame) Q_DECL_OVERRIDE; QWebEnginePage *createWindow(QWebEnginePage::WebWindowType type) Q_DECL_OVERRIDE; #if !defined(QT_NO_UITOOLS) QObject *createPlugin(const QString &classId, const QUrl &url, const QStringList ¶mNames, const QStringList ¶mValues); @@ -84,7 +79,6 @@ private: // set the webview mousepressedevent Qt::KeyboardModifiers m_keyboardModifiers; Qt::MouseButtons m_pressedButtons; - QUrl m_loadingUrl; }; class WebView : public QWebEngineView { -- cgit v1.2.3 From 4ff390203caf278dcee20e1a61402431fd2166c2 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Mon, 11 Apr 2016 19:23:18 +0200 Subject: Fix contextMenu handling in examples Adds missing deleteLater on close Change-Id: Id337856f138e0d38f0c72d3962ccac309d36c73e Reviewed-by: Kai Koehne Reviewed-by: Eike Ziller --- examples/webenginewidgets/demobrowser/webview.cpp | 7 ++++--- examples/webenginewidgets/simplebrowser/webview.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'examples/webenginewidgets') diff --git a/examples/webenginewidgets/demobrowser/webview.cpp b/examples/webenginewidgets/demobrowser/webview.cpp index 9feedc0b5..94e872dbf 100644 --- a/examples/webenginewidgets/demobrowser/webview.cpp +++ b/examples/webenginewidgets/demobrowser/webview.cpp @@ -363,10 +363,11 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) if (it != actions.cend()) { (*it)->setText(tr("Open Link in This Window")); ++it; - menu->insertAction(*it, page()->action(QWebEnginePage::OpenLinkInNewWindow)); - menu->insertAction(*it, page()->action(QWebEnginePage::OpenLinkInNewTab)); + QAction *before(it == actions.cend() ? nullptr : *it); + menu->insertAction(before, page()->action(QWebEnginePage::OpenLinkInNewWindow)); + menu->insertAction(before, page()->action(QWebEnginePage::OpenLinkInNewTab)); } - + connect(menu, &QMenu::aboutToHide, menu, &QObject::deleteLater); menu->popup(event->globalPos()); } diff --git a/examples/webenginewidgets/simplebrowser/webview.cpp b/examples/webenginewidgets/simplebrowser/webview.cpp index 1fabcc69f..de93bc0c4 100644 --- a/examples/webenginewidgets/simplebrowser/webview.cpp +++ b/examples/webenginewidgets/simplebrowser/webview.cpp @@ -154,9 +154,11 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) if (it != actions.cend()) { (*it)->setText(tr("Open Link in This Tab")); ++it; - menu->insertAction(*it, page()->action(QWebEnginePage::OpenLinkInNewWindow)); - menu->insertAction(*it, page()->action(QWebEnginePage::OpenLinkInNewTab)); + QAction *before(it == actions.cend() ? nullptr : *it); + menu->insertAction(before, page()->action(QWebEnginePage::OpenLinkInNewWindow)); + menu->insertAction(before, page()->action(QWebEnginePage::OpenLinkInNewTab)); } + connect(menu, &QMenu::aboutToHide, menu, &QObject::deleteLater); menu->popup(event->globalPos()); } -- cgit v1.2.3