summaryrefslogtreecommitdiff
authorar <ar>2005-03-10 16:21:07 (UTC)
committer ar <ar>2005-03-10 16:21:07 (UTC)
commit3bf4809c4f2263f0130472c41aa6c85e46e61db9 (patch) (side-by-side diff)
tree82c34fddb63bb6ca8cbd53709ab2642795241d38
parent95a99e7b75eddc5629e839698b762f594be42b9f (diff)
downloadopie-3bf4809c4f2263f0130472c41aa6c85e46e61db9.zip
opie-3bf4809c4f2263f0130472c41aa6c85e46e61db9.tar.gz
opie-3bf4809c4f2263f0130472c41aa6c85e46e61db9.tar.bz2
- implement nomax.patch from openembedded
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp8
-rw-r--r--library/widget_showing.cpp4
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
@@ -250,6 +250,7 @@ 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 )
@@ -271,7 +272,7 @@ public:
return TRUE;
}
-
+#endif
return FALSE;
}
@@ -320,8 +321,8 @@ 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;
@@ -342,6 +343,7 @@ public:
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
@@ -52,8 +52,12 @@ void QPEApplication::showWidget( QWidget* wg, bool nomax ) {
return;
}
+#ifndef OPIE_NO_WINDOWED
+ if ( TRUE ) {
+#else
if ( !nomax
&& ( qApp->desktop()->width() <= 320 ) ){
+#endif
wg->showMaximized();
} else {
#ifdef Q_WS_QWS