zealdocs/zeal
1
1
Fork 0
mirror of https://github.com/zealdocs/zeal.git synced 2024-11-22 21:53:03 +03:00
Code Issues Projects Releases Wiki Activity

fix(browser): do not accept mouse press events (fixes #1079)

Browse Source 
This allows to fallback to QWebKit, if Zeal doesn't handle the event.
This commit is contained in:
Oleg Shparber 2019-03-26 00:43:38 -04:00
parent 4cc0c20b32
commit a0583a8fdb
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/browser/webview.cpp
View File

@ -184,14 +184,16 @@ void WebView::mousePressEvent(QMouseEvent *event)
event->accept();
return;
case Qt::LeftButton:
case Qt::MiddleButton:
m_clickedLink = hitTestContent(event->pos()).linkUrl();
if (!m_clickedLink.isValid() || m_clickedLink.scheme() == QLatin1String("javascript")) {
break;
case Qt::MiddleButton: {
m_clickedLink.clear();
const QUrl clickedLink = hitTestContent(event->pos()).linkUrl();
if (clickedLink.isValid() && clickedLink.scheme() != QLatin1String("javascript")) {
m_clickedLink = clickedLink;
}
event->accept();
return;
break;
}
default:
break;
}
@ -201,7 +203,8 @@ void WebView::mousePressEvent(QMouseEvent *event)
void WebView::mouseReleaseEvent(QMouseEvent *event)
{
if (event->button() != Qt::LeftButton && event->button() != Qt::MiddleButton) {
if (m_clickedLink.isEmpty()
|| (event->button() != Qt::LeftButton && event->button() != Qt::MiddleButton)) {
QWebView::mouseReleaseEvent(event);
return;
}
@ -268,8 +271,7 @@ void WebView::mouseReleaseEvent(QMouseEvent *event)
switch (event->button()) {
case Qt::LeftButton:
if (!(event->modifiers() & Qt::ControlModifier || event->modifiers() & Qt::ShiftModifier)) {
load(clickedLink);
event->accept();
QWebView::mouseReleaseEvent(event);
return;
}
case Qt::MiddleButton: