-rw-r--r-- | library/qpeapplication.h | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 9ea7e9d..8c85ad0 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -203,26 +203,31 @@ extern Q_EXPORT QRect qt_maxWindowRect; | |||
203 | 203 | ||
204 | inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) | 204 | inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) |
205 | { | 205 | { |
206 | if ( !nomax | 206 | if ( wg->isVisible() ) |
207 | && ( qApp->desktop()->width() <= 320 ) ) | ||
208 | { | ||
209 | wg->showMaximized(); | ||
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 | |||
224 | wg->resize( w, h ); | ||
225 | wg->show(); | 207 | wg->show(); |
208 | else | ||
209 | { | ||
210 | if ( !nomax | ||
211 | && ( qApp->desktop()->width() <= 320 ) ) | ||
212 | { | ||
213 | wg->showMaximized(); | ||
214 | } else { | ||
215 | #ifdef Q_WS_QWS | ||
216 | QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() ); | ||
217 | #else | ||
218 | QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() ); | ||
219 | #endif | ||
220 | |||
221 | QSize sh = wg->sizeHint(); | ||
222 | int w = QMAX( sh.width(), wg->width() ); | ||
223 | int h = QMAX( sh.height(), wg->height() ); | ||
224 | // desktop widget-frame taskbar | ||
225 | w = QMIN( w, ( desk.width() - ( wg->frameGeometry().width() - wg->geometry().width() ) - 25 ) ); | ||
226 | h = QMIN( h, ( desk.height() - ( wg->frameGeometry().height() - wg->geometry().height() ) - 25 ) ); | ||
227 | |||
228 | wg->resize( w, h ); | ||
229 | wg->show(); | ||
230 | } | ||
226 | } | 231 | } |
227 | } | 232 | } |
228 | 233 | ||