| -rw-r--r-- | library/qpeapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 5d05ed5..3370264 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -989,17 +989,17 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e ) while ( active && active->isPopup() ) { active->close(); active = activeWindow(); } } else { // make sure our modal widget is ALWAYS on top QWidget *topm = activeModalWidget(); - if ( topm ) { + if ( topm && static_cast<int>( topm->winId() ) != fe->simpleData.window) { topm->raise(); } } if ( fe->simpleData.get_focus && inputMethodDict ) { InputMethodHint m = inputMethodHint( QWidget::find( e->window() ) ); if ( m == AlwaysOff ) Global::hideInputMethod(); if ( m == AlwaysOn ) @@ -1460,17 +1460,17 @@ bool QPEApplication::raiseAppropriateWindow() topsub = w; } } d->lastraised = topsub; delete list; } // 3. Raise the active modal widget. - if ( topm && topm != top ) { + if ( topm ) { topm->show(); topm->raise(); // If we haven't already handled the fastAppShowing message if (!top && d->preloaded) { #ifndef QT_NO_COP QCopEnvelope e("QPE/System", "fastAppShowing(QString)"); e << d->appName; #endif |