- 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
@@ -249,8 +249,9 @@ public:
     }
 
     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;
@@ -270,9 +271,9 @@ public:
         maximized = l[4].toInt();
 
         return TRUE;
     }
-
+#endif
     return FALSE;
     }
 
 
@@ -319,10 +320,10 @@ public:
 
     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
@@ -341,8 +342,9 @@ public:
     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*/ )
     {
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
@@ -51,10 +51,14 @@ void QPEApplication::showWidget( QWidget* wg, bool nomax ) {
         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() );