- implement nomax.patch from openembedded

2 files changed, 9 insertions, 3 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 953f9d0..0f3e4a4 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -237,54 +237,55 @@ public:
                     mw->move( QMAX(x,0), QMAX(y,0) );
 #ifdef Q_WS_QWS
                     if ( !nomaximize )
                         mw->showMaximized();
 #endif
                 }
                 if ( max && !nomaximize )
                     mw->showMaximized();
                 else
                     mw->show();
             }
         }
     }
 
     static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s)
     {
+#ifndef OPIE_NO_WINDOWED
     maximized = TRUE;
     // 350 is the trigger in qwsdefaultdecoration for providing a resize button
     if ( qApp->desktop()->width() <= 350 )
         return FALSE;
 
     Config cfg( "qpe" );
     cfg.setGroup("ApplicationPositions");
     QString str = cfg.readEntry( app, QString::null );
     QStringList l = QStringList::split(",", str);
 
     if ( l.count() == 5) {
         p.setX( l[0].toInt() );
         p.setY( l[1].toInt() );
 
         s.setWidth( l[2].toInt() );
         s.setHeight( l[3].toInt() );
 
         maximized = l[4].toInt();
 
         return TRUE;
     }
-
+#endif
     return FALSE;
     }
 
 
         static bool validate_widget_size(const QWidget *w, QPoint &p, QSize &s)
     {
 #ifndef Q_WS_QWS
     QRect qt_maxWindowRect = qApp->desktop()->geometry();
 #endif
     int maxX = qt_maxWindowRect.width();
     int maxY = qt_maxWindowRect.height();
     int wWidth = s.width() + ( w->frameGeometry().width() - w->geometry().width() );
     int wHeight = s.height() + ( w->frameGeometry().height() - w->geometry().height() );
 
     // total window size is not allowed to be larger than desktop window size
     if ( ( wWidth >= maxX ) && ( wHeight >= maxY ) )
@@ -307,54 +308,55 @@ public:
     if ( p.x() < 0 )
         p.setX(0);
     if ( p.y() < 0 )
         p.setY(0);
 
     if ( p.x() + wWidth > maxX )
         p.setX( maxX - wWidth );
     if ( p.y() + wHeight > maxY )
         p.setY( maxY - wHeight );
 
     return TRUE;
     }
 
     static void store_widget_rect(QWidget *w, QString &app)
     {
     if( !w )
-        return;
-
+    return;
+#ifndef OPIE_NO_WINDOWED
     // 350 is the trigger in qwsdefaultdecoration for providing a resize button
     if ( qApp->desktop()->width() <= 350 )
         return;
     // we use these to map the offset of geometry and pos.  ( we can only use normalGeometry to
     // get the non-maximized version, so we have to do it the hard way )
     int offsetX = w->x() - w->geometry().left();
     int offsetY = w->y() - w->geometry().top();
 
     QRect r;
     if ( w->isMaximized() )
         r = ( (HackWidget *) w)->normalGeometry();
     else
         r = w->geometry();
 
     // Stores the window placement as pos(), size()  (due to the offset mapping)
     Config cfg( "qpe" );
     cfg.setGroup("ApplicationPositions");
     QString s;
     s.sprintf("%d,%d,%d,%d,%d", r.left() + offsetX, r.top() + offsetY, r.width(), r.height(), w->isMaximized() );
     cfg.writeEntry( app, s );
+#endif
     }
 
     static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ )
     {
         /*
         // This works but disable it for now until it is safe to apply
         // What is does is scan the .desktop files of all the apps for
         // the applnk that has the corresponding argv[0] as this program
         // then it uses the name stored in the .desktop file as the caption
         // for the main widget. This saves duplicating translations for
         // the app name in the program and in the .desktop files.
 
         AppLnkSet apps( appsPath );
 
         QList<AppLnk> appsList = apps.children();
         for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) {
diff --git a/library/widget_showing.cpp b/library/widget_showing.cpp
index 43ece64..43d19b0 100644
--- a/library/widget_showing.cpp
+++ b/library/widget_showing.cpp
@@ -39,34 +39,38 @@ void QPEApplication::showDialog( QDialog* d, bool nomax )
 {
     showWidget( d, nomax );
 }
 
 int QPEApplication::execDialog( QDialog* d, bool nomax )
 {
     showDialog( d, nomax );
     return d->exec();
 }
 
 void QPEApplication::showWidget( QWidget* wg, bool nomax ) {
     if ( wg->isVisible() ) {
         wg->show();
         return;
     }
 
+#ifndef OPIE_NO_WINDOWED
+    if ( TRUE ) {
+#else
     if ( !nomax
          && ( qApp->desktop()->width() <= 320 ) ){
+#endif
         wg->showMaximized();
     } else {
 #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();