| -rw-r--r-- | library/qpeapplication.cpp | 6 | ||||
| -rw-r--r-- | library/widget_showing.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 953f9d0..0f3e4a4 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -245,16 +245,17 @@ public: 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 ); @@ -266,17 +267,17 @@ public: 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(); @@ -316,17 +317,17 @@ public: return TRUE; } static void store_widget_rect(QWidget *w, QString &app) { if( !w ) 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(); @@ -337,16 +338,17 @@ public: 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 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 @@ -47,18 +47,22 @@ int QPEApplication::execDialog( QDialog* d, bool nomax ) } 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 |