diff options
| author |   nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2004-12-28 14:40:07 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2004-12-28 14:40:07 +0000 |
| commit | 2531374a6b83ab89dcc1d4372d00ced1f8dd6510 (patch) | |
| tree | e898a4d890ee1d9bff662e077e6f7a8d31911ce6 /packages/libqpe/libqpe-opie | |
| parent | 924e882216f2a6328ab811eb14a4b890c7c06cb1 (diff) | |
| download | openembedded-2531374a6b83ab89dcc1d4372d00ced1f8dd6510.tar.gz | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2004/12/28 15:11:36+01:00 uni-frankfurt.de!mickeyl
libqpe-opie: bump PR and use proper pnum
2004/12/28 14:40:47+01:00 uni-frankfurt.de!mickeyl
catch up libqpe-opie nomax patch w/ upstream changes
BKrev: 41d17047Rf6VJ8LBEM1PzFiHbf4WBg
Diffstat (limited to 'packages/libqpe/libqpe-opie')
| -rw-r--r-- | packages/libqpe/libqpe-opie/nomax.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/packages/libqpe/libqpe-opie/nomax.patch b/packages/libqpe/libqpe-opie/nomax.patch index e69de29bb2..bf03cc2a33 100644 --- a/packages/libqpe/libqpe-opie/nomax.patch +++ b/packages/libqpe/libqpe-opie/nomax.patch @@ -0,0 +1,56 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- library/widget_showing.cpp~nomax ++++ library/widget_showing.cpp +@@ -51,9 +51,12 @@ + wg->show(); + return; + } +- ++#ifndef OPIE_NO_WINDOWED ++ if ( TRUE ) { ++#else + if ( !nomax + && ( qApp->desktop()->width() <= 320 ) ){ ++#endif + wg->showMaximized(); + } else { + #ifdef Q_WS_QWS +--- library/qpeapplication.cpp~nomax ++++ library/qpeapplication.cpp +@@ -251,6 +251,7 @@ + + 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 ) +@@ -272,7 +273,7 @@ + + return TRUE; + } +- ++#endif + return FALSE; + } + +@@ -320,6 +321,7 @@ + + static void store_widget_rect(QWidget *w, QString &app) + { ++#ifndef OPIE_NO_WINDOWED + // 350 is the trigger in qwsdefaultdecoration for providing a resize button + if ( qApp->desktop()->width() <= 350 ) + return; +@@ -340,6 +342,7 @@ + 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*/ ) |