summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp16
-rw-r--r--library/qpeapplication.h2
-rw-r--r--library/widget_showing.cpp9
3 files changed, 15 insertions, 12 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index dcc1001..34f5e6a 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -103,2 +103,3 @@
static bool useBigPixmaps = 0;
+static bool saveWindowsPos = 0;
@@ -131,2 +132,3 @@ public:
bigIconSize = cfg.readNumEntry( "BigIconSize", 32 );
+ saveWindowsPos = cfg.readBoolEntry( "AllowWindowed", false );
#ifdef OPIE_WITHROHFEEDBACK
@@ -252,3 +254,4 @@ public:
{
-#ifndef OPIE_NO_WINDOWED
+ if (!saveWindowsPos)
+ return FALSE;
maximized = TRUE;
@@ -274,4 +277,2 @@ public:
}
-#endif
- return FALSE;
}
@@ -324,3 +325,4 @@ public:
return;
-#ifndef OPIE_NO_WINDOWED
+ if (!saveWindowsPos)
+ return;
// 350 is the trigger in qwsdefaultdecoration for providing a resize button
@@ -345,3 +347,2 @@ public:
cfg.writeEntry( app, s );
-#endif
}
@@ -2209,2 +2210,7 @@ void QPEApplication::hideOrQuit()
+bool QPEApplication::isSaveWindowsPos()
+{
+ return saveWindowsPos;
+}
+
#if (__GNUC__ > 2 ) && !defined(_OS_MACX_)
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 6486cad..7c99a9a 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -139,2 +139,4 @@ public:
+ static bool isSaveWindowsPos();
+
signals:
diff --git a/library/widget_showing.cpp b/library/widget_showing.cpp
index e43a16a..cc1bfb2 100644
--- a/library/widget_showing.cpp
+++ b/library/widget_showing.cpp
@@ -54,9 +54,4 @@ void QPEApplication::showWidget( QWidget* wg, bool nomax ) {
-#ifdef OPIE_NO_WINDOWED
- Q_UNUSED( nomax )
- if ( TRUE ) {
-#else
- if ( !nomax
- && ( qApp->desktop()->width() <= 320 ) ){
-#endif
+ if ( !isSaveWindowsPos() || (!nomax
+ && ( qApp->desktop()->width() <= 30 )) ){
wg->showMaximized();