[Fix] crash in Click2Flash plugin when element is not found.

- also little improvement in WebView mousepress events
remotes/origin/falkon
nowrep 14 years ago
parent 89cad89ad0
commit 5af4df90b7
  1. 9
      src/plugins/clicktoflash.cpp
  2. 5
      src/webview/webview.cpp

@ -171,8 +171,13 @@ void ClickToFlash::findElement()
QPoint objectPos = view->mapFromGlobal(m_toolButton->mapToGlobal(m_toolButton->pos()));
QWebFrame* objectFrame = view->page()->frameAt(objectPos);
QWebHitTestResult hitResult = objectFrame->hitTestContent(objectPos);
QWebElement hitElement = hitResult.element();
QWebHitTestResult hitResult;
QWebElement hitElement;
if (objectFrame) {
hitResult = objectFrame->hitTestContent(objectPos);
hitElement = hitResult.element();
}
if (!hitElement.isNull()) {
m_element = hitElement;

@ -846,10 +846,12 @@ void WebView::mousePressEvent(QMouseEvent* event)
if (isUrlValid(QUrl(m_hoveredLink))) {
tabWidget()->addView(QUrl::fromEncoded(m_hoveredLink.toUtf8()), tr("New tab"), TabWidget::NewBackgroundTab);
event->accept();
return;
}
#ifdef Q_WS_WIN
else {
QWebView::mouseDoubleClickEvent(event);
return;
}
#endif
break;
@ -859,9 +861,10 @@ void WebView::mousePressEvent(QMouseEvent* event)
return;
}
default:
QWebView::mousePressEvent(event);
break;
}
QWebView::mousePressEvent(event);
}
void WebView::keyPressEvent(QKeyEvent* event)

Loading…
Cancel
Save