delimited screen-size to desktop-size, if this is smaller than the widget's one

only the taskbar size is approximated

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
@@ -143,117 +143,121 @@ signals:
     void volumeChanged( bool muted );
     void appMessage( const QCString& msg, const QByteArray& data);
     void weekChanged( bool startOnMonday );
     void dateFormatChanged( DateFormat );
     void flush();
     void reload();
     /* linkChanged signal */
 
 private slots:
     void systemMessage( const QCString &msg, const QByteArray &data );
     void pidMessage( const QCString &msg, const QByteArray &data );
     void removeSenderFromStylusDict();
     void hideOrQuit();
 
 protected:
     bool qwsEventFilter( QWSEvent * );
     void internalSetStyle( const QString &style );
     void prepareForTermination(bool willrestart);
     virtual void restart();
     virtual void shutdown();
     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
-            && (  qApp->desktop()->width() <= 320 ) )
-    {
-        d->showMaximized();
-    } else {
-        d->resize(w,h);
-        d->show();
-    }
+    showWidget( d, nomax );
 }
 
 inline int QPEApplication::execDialog( QDialog* d, bool nomax )
 {
-    showDialog(d,nomax);
+    showDialog( d, nomax );
     return d->exec();
 }
 
+#ifdef Q_WS_QWS
+extern Q_EXPORT QRect qt_maxWindowRect;
+#endif
+
 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
             && ( qApp->desktop()->width() <= 320 ) )
     {
         wg->showMaximized();
     } else {
-        wg->resize(w,h);
+        #ifdef Q_WS_QWS
+            QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() );
+        #else
+            QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() );
+        #endif
+
+        QSize sh = wg->sizeHint();
+        int w = QMAX( sh.width(), wg->width() );
+        int h = QMAX( sh.height(), wg->height() );
+        //              desktop                              widget-frame                      taskbar
+        w = QMIN( w, ( desk.width() - ( wg->frameGeometry().width() - wg->geometry().width() ) - 25 ) );
+        h = QMIN( h, ( desk.height() - ( wg->frameGeometry().height() - wg->geometry().height() ) - 25 ) );
+
+        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;
+    int d = static_cast<int>( t );
+    return d * 90;
 }
 
 inline Transformation DegToTrans ( int d )
 {
-	Transformation t = static_cast<Transformation>( d / 90 );
-	return t;
+    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()
 #if QT_VERSION > 233
     Transformation e = DegToTrans( r );
     ::setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 );
     qApp->desktop()->qwsDisplay()->setTransformation( e );
 #else
     setDefaultRotation( r );
 #endif
 }
 
 
 #endif