Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix catching keyPressEvent using Qt WebEngine

This commit is contained in:
Martchus 2016-11-16 21:10:04 +01:00
parent abf6febf2c
commit 945ea2e7e0
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tray/gui/webviewdialog.cpp
View File

@ -31,6 +31,13 @@ WebViewDialog::WebViewDialog(QWidget *parent) :
m_view->setPage(new WebPage(this, m_view));
connect(m_view, &WEB_VIEW_PROVIDER::titleChanged, this, &WebViewDialog::setWindowTitle);
#if defined(SYNCTHINGTRAY_USE_WEBENGINE)
m_view->installEventFilter(this);
if(m_view->focusProxy()) {
m_view->focusProxy()->installEventFilter(this);
}
#endif
if(Settings::values().webView.geometry.isEmpty()) {
resize(1200, 800);
centerWidget(this);
@ -94,7 +101,6 @@ void WebViewDialog::keyPressEvent(QKeyEvent *event)
event->accept();
break;
case Qt::Key_Escape:
// FIXME: never called when using Qt WebEngine, hence close on ESC does not work yet
closeUnlessModalVisible();
event->accept();
break;
@ -103,6 +109,25 @@ void WebViewDialog::keyPressEvent(QKeyEvent *event)
}
}
#if defined(SYNCTHINGTRAY_USE_WEBENGINE)
bool WebViewDialog::eventFilter(QObject *watched, QEvent *event)
{
switch(event->type()) {
case QEvent::ChildAdded:
if(m_view->focusProxy()) {
m_view->focusProxy()->installEventFilter(this);
}
break;
case QEvent::KeyPress:
keyPressEvent(static_cast<QKeyEvent *>(event));
break;
default:
;
}
return QMainWindow::eventFilter(watched, event);
}
#endif
}
#endif // SYNCTHINGTRAY_NO_WEBVIEW

3
tray/gui/webviewdialog.h
View File

@ -34,6 +34,9 @@ public slots:
protected:
void closeEvent(QCloseEvent *event);
void keyPressEvent(QKeyEvent *event);
#if defined(SYNCTHINGTRAY_USE_WEBENGINE)
bool eventFilter(QObject *watched, QEvent *event);
#endif
private:
WEB_VIEW_PROVIDER *m_view;