-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 | |||
@@ -190,13 +190,3 @@ inline void QPEApplication::showDialog( QDialog* d, bool nomax ) | |||
190 | { | 190 | { |
191 | QSize sh = d->sizeHint(); | 191 | showWidget( d, nomax ); |
192 | int w = QMAX(sh.width(),d->width()); | ||
193 | int h = QMAX(sh.height(),d->height()); | ||
194 | if ( !nomax | ||
195 | && ( qApp->desktop()->width() <= 320 ) ) | ||
196 | { | ||
197 | d->showMaximized(); | ||
198 | } else { | ||
199 | d->resize(w,h); | ||
200 | d->show(); | ||
201 | } | ||
202 | } | 192 | } |
@@ -209,7 +199,8 @@ inline int QPEApplication::execDialog( QDialog* d, bool nomax ) | |||
209 | 199 | ||
200 | #ifdef Q_WS_QWS | ||
201 | extern Q_EXPORT QRect qt_maxWindowRect; | ||
202 | #endif | ||
203 | |||
210 | inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) | 204 | inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) |
211 | { | 205 | { |
212 | QSize sh = wg->sizeHint(); | ||
213 | int w = QMAX(sh.width(),wg->width()); | ||
214 | int h = QMAX(sh.height(),wg->height()); | ||
215 | if ( !nomax | 206 | if ( !nomax |
@@ -219,2 +210,15 @@ inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) | |||
219 | } else { | 210 | } else { |
211 | #ifdef Q_WS_QWS | ||
212 | QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() ); | ||
213 | #else | ||
214 | QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() ); | ||
215 | #endif | ||
216 | |||
217 | QSize sh = wg->sizeHint(); | ||
218 | int w = QMAX( sh.width(), wg->width() ); | ||
219 | int h = QMAX( sh.height(), wg->height() ); | ||
220 | // desktop widget-frame taskbar | ||
221 | w = QMIN( w, ( desk.width() - ( wg->frameGeometry().width() - wg->geometry().width() ) - 25 ) ); | ||
222 | h = QMIN( h, ( desk.height() - ( wg->frameGeometry().height() - wg->geometry().height() ) - 25 ) ); | ||
223 | |||
220 | wg->resize(w,h); | 224 | wg->resize(w,h); |