summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.h6
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
@@ -187,18 +187,17 @@ private:
187}; 187};
188 188
189inline void QPEApplication::showDialog( QDialog* d, bool nomax ) 189inline 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 }
203} 202}
204 203
@@ -209,18 +208,17 @@ inline int QPEApplication::execDialog( QDialog* d, bool nomax )
209} 208}
210 209
211inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) 210inline 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 }
225} 223}
226 224