| -rw-r--r-- | library/qpeapplication.h | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 8deca21..9ea7e9d 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h @@ -188,17 +188,7 @@ private: inline void QPEApplication::showDialog( QDialog* d, bool nomax ) { - QSize sh = d->sizeHint(); - int w = QMAX(sh.width(),d->width()); - int h = QMAX(sh.height(),d->height()); - if ( !nomax - && ( qApp->desktop()->width() <= 320 ) ) - { - d->showMaximized(); - } else { - d->resize(w,h); - d->show(); - } + showWidget( d, nomax ); } inline int QPEApplication::execDialog( QDialog* d, bool nomax ) @@ -207,16 +197,30 @@ inline int QPEApplication::execDialog( QDialog* d, bool nomax ) return d->exec(); } +#ifdef Q_WS_QWS +extern Q_EXPORT QRect qt_maxWindowRect; +#endif + inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) { - QSize sh = wg->sizeHint(); - int w = QMAX(sh.width(),wg->width()); - int h = QMAX(sh.height(),wg->height()); if ( !nomax && ( qApp->desktop()->width() <= 320 ) ) { wg->showMaximized(); } else { + #ifdef Q_WS_QWS + QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() ); + #else + QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() ); + #endif + + QSize sh = wg->sizeHint(); + int w = QMAX( sh.width(), wg->width() ); + int h = QMAX( sh.height(), wg->height() ); + // desktop widget-frame taskbar + w = QMIN( w, ( desk.width() - ( wg->frameGeometry().width() - wg->geometry().width() ) - 25 ) ); + h = QMIN( h, ( desk.height() - ( wg->frameGeometry().height() - wg->geometry().height() ) - 25 ) ); + wg->resize(w,h); wg->show(); } |