diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2018-02-23 01:45:58 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2018-02-23 01:45:58 +0100 |
| commit | ea6292168a6acd4c263913f0ccd7dd64daf4f5cf (patch) | |
| tree | 312024abbd7c3c100274f3a8031d49096480b654 /src/browserview.cpp | |
| parent | 5e5c9c07291f6b09623d31c92b1fb61c4ede576e (diff) | |
Revert "Applied clang-format on source"
This reverts commit 5e5c9c07291f6b09623d31c92b1fb61c4ede576e.
Diffstat (limited to 'src/browserview.cpp')
| -rw-r--r-- | src/browserview.cpp | 77 |
1 files changed, 41 insertions, 36 deletions
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 <http://www.gnu.org/licenses/>. #include "browserview.h"
-#include "utility.h"
#include <QEvent>
#include <QKeyEvent>
-#include <QMenu>
#include <QNetworkDiskCache>
#include <QWebEngineContextMenuData>
#include <QWebEngineSettings>
+#include <QMenu>
#include <Shlwapi.h>
+#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<QKeyEvent*>(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<QMouseEvent*>(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<QMouseEvent*>(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<QKeyEvent*>(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<QMouseEvent*>(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<QMouseEvent*>(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);
}
|