| -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 @@ -163,88 +163,86 @@ protected: bool eventFilter( QObject *, QEvent * ); void timerEvent( QTimerEvent * ); bool raiseAppropriateWindow(); virtual void tryQuit(); #if QT_VERSION > 233 virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) #endif private: #ifndef QT_NO_TRANSLATION void installTranslation( const QString& baseName ); #endif void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); void processQCopFile(); #if defined(Q_WS_QWS) && !defined(QT_NO_COP) QCopChannel *sysChannel; QCopChannel *pidChannel; #endif QPEApplicationData *d; bool reserved_sh; }; inline void QPEApplication::showDialog( QDialog* d, bool nomax ) { QSize sh = d->sizeHint(); int w = QMAX(sh.width(),d->width()); int h = QMAX(sh.height(),d->height()); if ( !nomax - && ( w > qApp->desktop()->width()*3/4 - || h > qApp->desktop()->height()*3/4 ) ) + && ( qApp->desktop()->width() <= 320 ) ) { d->showMaximized(); } else { d->resize(w,h); d->show(); } } inline int QPEApplication::execDialog( QDialog* d, bool nomax ) { showDialog(d,nomax); return d->exec(); } inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) { QSize sh = wg->sizeHint(); int w = QMAX(sh.width(),wg->width()); int h = QMAX(sh.height(),wg->height()); if ( !nomax - && ( w > qApp->desktop()->width()*3/4 - || h > qApp->desktop()->height()*3/4 ) ) + && ( qApp->desktop()->width() <= 320 ) ) { wg->showMaximized(); } else { wg->resize(w,h); wg->show(); } } enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ inline int TransToDeg ( Transformation t ) { int d = static_cast<int>( t ); return d * 90; } inline Transformation DegToTrans ( int d ) { Transformation t = static_cast<Transformation>( d / 90 ); return t; } /* * Set current rotation of Opie, and rotation for newly started apps. * Differs from setDefaultRotation in that 1) it rotates currently running apps, * and 2) does not set deforient or save orientation to qpe.conf. */ inline void QPEApplication::setCurrentRotation( int r ) { // setTransformation has been introduced in Qt/Embedded 2.3.4 snapshots // for compatibility with the SharpROM use fallback to setDefaultTransformation() |