+ do not filter events from modal message box if WaitCursor is instantiated
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5098 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
@@ -57,6 +57,19 @@ struct ProgressBarPrivate
|
||||
QTimer* delayShowTimer;
|
||||
int minimumDuration;
|
||||
int observeEventFilter;
|
||||
|
||||
bool isModalDialog(QObject* o) const
|
||||
{
|
||||
QWidget* parent = qobject_cast<QWidget*>(o);
|
||||
while (parent) {
|
||||
QMessageBox* dlg = qobject_cast<QMessageBox*>(parent);
|
||||
if (dlg && dlg->isModal())
|
||||
return true;
|
||||
parent = parent->parentWidget();
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -465,6 +478,8 @@ bool ProgressBar::eventFilter(QObject* o, QEvent* e)
|
||||
// do a system beep and ignore the event
|
||||
case QEvent::MouseButtonPress:
|
||||
{
|
||||
if (d->isModalDialog(o))
|
||||
return false;
|
||||
QApplication::beep();
|
||||
return true;
|
||||
} break;
|
||||
|
||||
Reference in New Issue
Block a user