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

Streamline forwarding of blocked events.

Browse Source 
Do not send to layouts, invoke modalWidget() only once.

Task-number: QTBUG-27039
Change-Id: I96db02c8da544d0961c8ab25505926ac6f699342
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint 2012-09-04 09:45:04 +02:00 committed by Qt by Nokia
parent 0e78e50802
commit 0f53c2c4e8
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/widgets/kernel/qwidget.cpp
View File

@ -8147,23 +8147,21 @@ bool QWidget::event(QEvent *event)
case QEvent::WindowBlocked:
case QEvent::WindowUnblocked:
{
QList<QObject*> childList = d->children;
for (int i = 0; i < childList.size(); ++i) {
QObject *o = childList.at(i);
if (o && o != QApplication::activeModalWidget()) {
if (qobject_cast<QWidget *>(o) && static_cast<QWidget *>(o)->isWindow()) {
// do not forward the event to child windows,
// QApplication does this for us
continue;
}
QApplication::sendEvent(o, event);
if (!d->children.isEmpty()) {
QWidget *modalWidget = QApplication::activeModalWidget();
for (int i = 0; i < d->children.size(); ++i) {
QObject *o = d->children.at(i);
if (o && o != modalWidget && o->isWidgetType()) {
QWidget *w = static_cast<QWidget *>(o);
// do not forward the event to child windows; QApplication does this for us
if (!w->isWindow())
QApplication::sendEvent(w, event);
}
}
}
#if defined(Q_WS_WIN)
setDisabledStyle(this, (event->type() == QEvent::WindowBlocked));
#endif
}
break;
#ifndef QT_NO_TOOLTIP
case QEvent::ToolTip: