summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.h44
1 files changed, 24 insertions, 20 deletions
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 8deca21..9ea7e9d 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -188,36 +188,40 @@ private:
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 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}
203 193
204inline int QPEApplication::execDialog( QDialog* d, bool nomax ) 194inline int QPEApplication::execDialog( QDialog* d, bool nomax )
205{ 195{
206 showDialog(d,nomax); 196 showDialog( d, nomax );
207 return d->exec(); 197 return d->exec();
208} 198}
209 199
200#ifdef Q_WS_QWS
201extern Q_EXPORT QRect qt_maxWindowRect;
202#endif
203
210inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) 204inline 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
216 && ( qApp->desktop()->width() <= 320 ) ) 207 && ( qApp->desktop()->width() <= 320 ) )
217 { 208 {
218 wg->showMaximized(); 209 wg->showMaximized();
219 } else { 210 } else {
220 wg->resize(w,h); 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 );
221 wg->show(); 225 wg->show();
222 } 226 }
223} 227}
@@ -226,14 +230,14 @@ enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws
226 230
227inline int TransToDeg ( Transformation t ) 231inline int TransToDeg ( Transformation t )
228{ 232{
229 int d = static_cast<int>( t ); 233 int d = static_cast<int>( t );
230 return d * 90; 234 return d * 90;
231} 235}
232 236
233inline Transformation DegToTrans ( int d ) 237inline Transformation DegToTrans ( int d )
234{ 238{
235 Transformation t = static_cast<Transformation>( d / 90 ); 239 Transformation t = static_cast<Transformation>( d / 90 );
236 return t; 240 return t;
237} 241}
238 242
239/* 243/*