AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when using Qt Virtual Keyboard with QCalendarWidget

Browse Source 
For some reason, QCalendarWidget gets filtered press events that were
intended for Qt Virtual Keyboard's input panel (QQuickView), so we have
to make sure that the window is indeed a QWidget - no static_cast.

Change-Id: Ibc9dce956918ac50d1fed8231a445b7338aef09c
Fixes: QTBUG-72925
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Mitch Curtis 2019-01-09 15:01:16 +01:00
parent 2e12bfdc1e
commit 7faec58d5c
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/widgets/widgets/qcalendarwidget.cpp
View File

@ -3063,19 +3063,22 @@ bool QCalendarWidget::eventFilter(QObject *watched, QEvent *event)
{
Q_D(QCalendarWidget);
if (event->type() == QEvent::MouseButtonPress && d->yearEdit->hasFocus()) {
// We can get filtered press events that were intended for Qt Virtual Keyboard's
// input panel (QQuickView), so we have to make sure that the window is indeed a QWidget - no static_cast.
// In addition, as we have a event filter on the whole application we first make sure that the top level widget
// of both this and the watched widget are the same to decide if we should finish the year edition.
QWidget *tlw = window();
QWidget *widget = static_cast<QWidget*>(watched);
//as we have a event filter on the whole application we first make sure that the top level widget
//of both this and the watched widget are the same to decide if we should finish the year edition.
if (widget->window() == tlw) {
QPoint mousePos = widget->mapTo(tlw, static_cast<QMouseEvent *>(event)->pos());
QRect geom = QRect(d->yearEdit->mapTo(tlw, QPoint(0, 0)), d->yearEdit->size());
if (!geom.contains(mousePos)) {
event->accept();
d->_q_yearEditingFinished();
setFocus();
return true;
}
QWidget *widget = qobject_cast<QWidget *>(watched);
if (!widget || widget->window() != tlw)
return QWidget::eventFilter(watched, event);
QPoint mousePos = widget->mapTo(tlw, static_cast<QMouseEvent *>(event)->pos());
QRect geom = QRect(d->yearEdit->mapTo(tlw, QPoint(0, 0)), d->yearEdit->size());
if (!geom.contains(mousePos)) {
event->accept();
d->_q_yearEditingFinished();
setFocus();
return true;
}
}
return QWidget::eventFilter(watched, event);