From 36aadcaa1e73362f7b9f64922715b46f0e8430d8 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 1 Apr 2016 07:58:11 +0200 Subject: [PATCH] Some shit. --- src/network-web/webbrowser.cpp | 3 --- src/network-web/webview.cpp | 17 ----------------- src/network-web/webview.h | 8 -------- 3 files changed, 28 deletions(-) diff --git a/src/network-web/webbrowser.cpp b/src/network-web/webbrowser.cpp index cc7078e3a..79e3942c6 100755 --- a/src/network-web/webbrowser.cpp +++ b/src/network-web/webbrowser.cpp @@ -199,9 +199,6 @@ void WebBrowser::createConnections() { // Forward title/icon changes. connect(m_webView, SIGNAL(titleChanged(QString)), this, SLOT(onTitleChanged(QString))); connect(m_webView, SIGNAL(iconUrlChanged(QUrl)), this, SLOT(onIconChanged())); - - // Misc connections. - connect(m_webView, SIGNAL(zoomFactorChanged()), this, SLOT(updateZoomGui())); } void WebBrowser::onIconChanged() { diff --git a/src/network-web/webview.cpp b/src/network-web/webview.cpp index 1ca3663f4..9e226a548 100755 --- a/src/network-web/webview.cpp +++ b/src/network-web/webview.cpp @@ -32,23 +32,6 @@ WebView::~WebView() { qDebug("Destroying WebView."); } -void WebView::wheelEvent(QWheelEvent *event) { - if (event->modifiers() & Qt::ControlModifier) { - if (event->delta() > 0) { - increaseWebPageZoom(); - emit zoomFactorChanged(); - return; - } - else if (event->delta() < 0) { - decreaseWebPageZoom(); - emit zoomFactorChanged(); - return; - } - } - - QWebEngineView::wheelEvent(event); -} - bool WebView::increaseWebPageZoom() { const qreal new_factor = zoomFactor() + 0.1; diff --git a/src/network-web/webview.h b/src/network-web/webview.h index a6adbb75e..f896d5de6 100755 --- a/src/network-web/webview.h +++ b/src/network-web/webview.h @@ -34,20 +34,12 @@ class WebView : public QWebEngineView { return m_page; } - signals: - // Emitted if user changes zoom factor via CTRL + mouse wheel combo. - void zoomFactorChanged(); - public slots: // Page zoom modifiers. bool increaseWebPageZoom(); bool decreaseWebPageZoom(); bool resetWebPageZoom(); - protected: - // Customize mouse wheeling. - void wheelEvent(QWheelEvent *event); - private: QWebEnginePage *m_page; };