summaryrefslogtreecommitdiff
Unidiff
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
@@ -249,8 +249,9 @@ public:
249 } 249 }
250 250
251 static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s) 251 static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s)
252 { 252 {
253#ifndef OPIE_NO_WINDOWED
253 maximized = TRUE; 254 maximized = TRUE;
254 // 350 is the trigger in qwsdefaultdecoration for providing a resize button 255 // 350 is the trigger in qwsdefaultdecoration for providing a resize button
255 if ( qApp->desktop()->width() <= 350 ) 256 if ( qApp->desktop()->width() <= 350 )
256 return FALSE; 257 return FALSE;
@@ -270,9 +271,9 @@ public:
270 maximized = l[4].toInt(); 271 maximized = l[4].toInt();
271 272
272 return TRUE; 273 return TRUE;
273 } 274 }
274 275#endif
275 return FALSE; 276 return FALSE;
276 } 277 }
277 278
278 279
@@ -319,10 +320,10 @@ public:
319 320
320 static void store_widget_rect(QWidget *w, QString &app) 321 static void store_widget_rect(QWidget *w, QString &app)
321 { 322 {
322 if( !w ) 323 if( !w )
323 return; 324 return;
324 325#ifndef OPIE_NO_WINDOWED
325 // 350 is the trigger in qwsdefaultdecoration for providing a resize button 326 // 350 is the trigger in qwsdefaultdecoration for providing a resize button
326 if ( qApp->desktop()->width() <= 350 ) 327 if ( qApp->desktop()->width() <= 350 )
327 return; 328 return;
328 // we use these to map the offset of geometry and pos. ( we can only use normalGeometry to 329 // we use these to map the offset of geometry and pos. ( we can only use normalGeometry to
@@ -341,8 +342,9 @@ public:
341 cfg.setGroup("ApplicationPositions"); 342 cfg.setGroup("ApplicationPositions");
342 QString s; 343 QString s;
343 s.sprintf("%d,%d,%d,%d,%d", r.left() + offsetX, r.top() + offsetY, r.width(), r.height(), w->isMaximized() ); 344 s.sprintf("%d,%d,%d,%d,%d", r.left() + offsetX, r.top() + offsetY, r.width(), r.height(), w->isMaximized() );
344 cfg.writeEntry( app, s ); 345 cfg.writeEntry( app, s );
346#endif
345 } 347 }
346 348
347 static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ ) 349 static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ )
348 { 350 {
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 ) {
51 wg->show(); 51 wg->show();
52 return; 52 return;
53 } 53 }
54 54
55#ifndef OPIE_NO_WINDOWED
56 if ( TRUE ) {
57#else
55 if ( !nomax 58 if ( !nomax
56 && ( qApp->desktop()->width() <= 320 ) ){ 59 && ( qApp->desktop()->width() <= 320 ) ){
60#endif
57 wg->showMaximized(); 61 wg->showMaximized();
58 } else { 62 } else {
59#ifdef Q_WS_QWS 63#ifdef Q_WS_QWS
60 QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() ); 64 QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() );