author | zecke <zecke> | 2004-02-21 23:54:24 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-21 23:54:24 (UTC) |
commit | 58f490cf6fd94ec27eec01c0ffc9d0411be594e8 (patch) (unidiff) | |
tree | f9d3ed019712e09744cd11c4a68df69e1e17605e | |
parent | 7595c4c5e1004efb0b4a3f6dcbd4d2baf7b9c8ac (diff) | |
download | opie-58f490cf6fd94ec27eec01c0ffc9d0411be594e8.zip opie-58f490cf6fd94ec27eec01c0ffc9d0411be594e8.tar.gz opie-58f490cf6fd94ec27eec01c0ffc9d0411be594e8.tar.bz2 |
Default to showMaximized on 240x320 and 320x240 displays
-rw-r--r-- | library/qpeapplication.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index c0f0bfc..8deca21 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -189,14 +189,13 @@ private: | |||
189 | inline void QPEApplication::showDialog( QDialog* d, bool nomax ) | 189 | inline void QPEApplication::showDialog( QDialog* d, bool nomax ) |
190 | { | 190 | { |
191 | QSize sh = d->sizeHint(); | 191 | QSize sh = d->sizeHint(); |
192 | int w = QMAX(sh.width(),d->width()); | 192 | int w = QMAX(sh.width(),d->width()); |
193 | int h = QMAX(sh.height(),d->height()); | 193 | int h = QMAX(sh.height(),d->height()); |
194 | if ( !nomax | 194 | if ( !nomax |
195 | && ( w > qApp->desktop()->width()*3/4 | 195 | && ( qApp->desktop()->width() <= 320 ) ) |
196 | || h > qApp->desktop()->height()*3/4 ) ) | ||
197 | { | 196 | { |
198 | d->showMaximized(); | 197 | d->showMaximized(); |
199 | } else { | 198 | } else { |
200 | d->resize(w,h); | 199 | d->resize(w,h); |
201 | d->show(); | 200 | d->show(); |
202 | } | 201 | } |
@@ -211,14 +210,13 @@ inline int QPEApplication::execDialog( QDialog* d, bool nomax ) | |||
211 | inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) | 210 | inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) |
212 | { | 211 | { |
213 | QSize sh = wg->sizeHint(); | 212 | QSize sh = wg->sizeHint(); |
214 | int w = QMAX(sh.width(),wg->width()); | 213 | int w = QMAX(sh.width(),wg->width()); |
215 | int h = QMAX(sh.height(),wg->height()); | 214 | int h = QMAX(sh.height(),wg->height()); |
216 | if ( !nomax | 215 | if ( !nomax |
217 | && ( w > qApp->desktop()->width()*3/4 | 216 | && ( qApp->desktop()->width() <= 320 ) ) |
218 | || h > qApp->desktop()->height()*3/4 ) ) | ||
219 | { | 217 | { |
220 | wg->showMaximized(); | 218 | wg->showMaximized(); |
221 | } else { | 219 | } else { |
222 | wg->resize(w,h); | 220 | wg->resize(w,h); |
223 | wg->show(); | 221 | wg->show(); |
224 | } | 222 | } |