From ea6292168a6acd4c263913f0ccd7dd64daf4f5cf Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Fri, 23 Feb 2018 01:45:58 +0100 Subject: Revert "Applied clang-format on source" This reverts commit 5e5c9c07291f6b09623d31c92b1fb61c4ede576e. --- src/browserview.cpp | 77 ++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 36 deletions(-) (limited to 'src/browserview.cpp') diff --git a/src/browserview.cpp b/src/browserview.cpp index a44792b2..0b871e23 100644 --- a/src/browserview.cpp +++ b/src/browserview.cpp @@ -19,53 +19,58 @@ along with Mod Organizer. If not, see . #include "browserview.h" -#include "utility.h" #include #include -#include #include #include #include +#include #include +#include "utility.h" + -BrowserView::BrowserView(QWidget* parent) : QWebEngineView(parent) { - installEventFilter(this); +BrowserView::BrowserView(QWidget *parent) + : QWebEngineView(parent) +{ + installEventFilter(this); - // page()->settings()->setMaximumPagesInCache(10); + //page()->settings()->setMaximumPagesInCache(10); } -QWebEngineView* BrowserView::createWindow(QWebEnginePage::WebWindowType) { - BrowserView* newView = new BrowserView(parentWidget()); - emit initTab(newView); - return newView; +QWebEngineView *BrowserView::createWindow(QWebEnginePage::WebWindowType) +{ + BrowserView *newView = new BrowserView(parentWidget()); + emit initTab(newView); + return newView; } -bool BrowserView::eventFilter(QObject* obj, QEvent* event) { - if (event->type() == QEvent::ShortcutOverride) { - QKeyEvent* keyEvent = static_cast(event); - if (keyEvent->matches(QKeySequence::Find)) { - emit startFind(); - } else if (keyEvent->matches(QKeySequence::FindNext)) { - emit findAgain(); - } - } else if (event->type() == QEvent::MouseButtonPress) { - QMouseEvent* mouseEvent = static_cast(event); - if (mouseEvent->button() == Qt::MidButton) { - mouseEvent->ignore(); - return true; - } - // TODO This is due to that QTWebEnginePage doesn't support QWebFrame anymore - // } else if (event->type() == QEvent::MouseButtonRelease) { - // QMouseEvent *mouseEvent = static_cast(event); - // if (mouseEvent->button() == Qt::MidButton) { - // QWebEngineContextMenuData hitTest = page()->hitTestContent(mouseEvent->pos()); - // if (hitTest.linkUrl().isValid()) { - // emit openUrlInNewTab(hitTest.linkUrl()); - // } - // mouseEvent->ignore(); - // - // return true; - // } +bool BrowserView::eventFilter(QObject *obj, QEvent *event) +{ + if (event->type() == QEvent::ShortcutOverride) { + QKeyEvent *keyEvent = static_cast(event); + if (keyEvent->matches(QKeySequence::Find)) { + emit startFind(); + } else if (keyEvent->matches(QKeySequence::FindNext)) { + emit findAgain(); + } + } else if (event->type() == QEvent::MouseButtonPress) { + QMouseEvent *mouseEvent = static_cast(event); + if (mouseEvent->button() == Qt::MidButton) { + mouseEvent->ignore(); + return true; } - return QWebEngineView::eventFilter(obj, event); +// TODO This is due to that QTWebEnginePage doesn't support QWebFrame anymore +// } else if (event->type() == QEvent::MouseButtonRelease) { +// QMouseEvent *mouseEvent = static_cast(event); +// if (mouseEvent->button() == Qt::MidButton) { +// QWebEngineContextMenuData hitTest = page()->hitTestContent(mouseEvent->pos()); +// if (hitTest.linkUrl().isValid()) { +// emit openUrlInNewTab(hitTest.linkUrl()); +// } +// mouseEvent->ignore(); +// +// return true; +// } + } + return QWebEngineView::eventFilter(obj, event); } -- cgit v1.3.1