author | ar <ar> | 2005-03-10 16:21:07 (UTC) |
---|---|---|
committer | ar <ar> | 2005-03-10 16:21:07 (UTC) |
commit | 3bf4809c4f2263f0130472c41aa6c85e46e61db9 (patch) (unidiff) | |
tree | 82c34fddb63bb6ca8cbd53709ab2642795241d38 | |
parent | 95a99e7b75eddc5629e839698b762f594be42b9f (diff) | |
download | opie-3bf4809c4f2263f0130472c41aa6c85e46e61db9.zip opie-3bf4809c4f2263f0130472c41aa6c85e46e61db9.tar.gz opie-3bf4809c4f2263f0130472c41aa6c85e46e61db9.tar.bz2 |
- implement nomax.patch from openembedded
-rw-r--r-- | library/qpeapplication.cpp | 8 | ||||
-rw-r--r-- | library/widget_showing.cpp | 4 |
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 | |||
@@ -245,16 +245,17 @@ public: | |||
245 | else | 245 | else |
246 | mw->show(); | 246 | mw->show(); |
247 | } | 247 | } |
248 | } | 248 | } |
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; |
257 | 258 | ||
258 | Config cfg( "qpe" ); | 259 | Config cfg( "qpe" ); |
259 | cfg.setGroup("ApplicationPositions"); | 260 | cfg.setGroup("ApplicationPositions"); |
260 | QString str = cfg.readEntry( app, QString::null ); | 261 | QString str = cfg.readEntry( app, QString::null ); |
@@ -266,17 +267,17 @@ public: | |||
266 | 267 | ||
267 | s.setWidth( l[2].toInt() ); | 268 | s.setWidth( l[2].toInt() ); |
268 | s.setHeight( l[3].toInt() ); | 269 | s.setHeight( l[3].toInt() ); |
269 | 270 | ||
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 | ||
279 | static bool validate_widget_size(const QWidget *w, QPoint &p, QSize &s) | 280 | static bool validate_widget_size(const QWidget *w, QPoint &p, QSize &s) |
280 | { | 281 | { |
281 | #ifndef Q_WS_QWS | 282 | #ifndef Q_WS_QWS |
282 | QRect qt_maxWindowRect = qApp->desktop()->geometry(); | 283 | QRect qt_maxWindowRect = qApp->desktop()->geometry(); |
@@ -315,18 +316,18 @@ public: | |||
315 | p.setY( maxY - wHeight ); | 316 | p.setY( maxY - wHeight ); |
316 | 317 | ||
317 | return TRUE; | 318 | return TRUE; |
318 | } | 319 | } |
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 |
329 | // get the non-maximized version, so we have to do it the hard way ) | 330 | // get the non-maximized version, so we have to do it the hard way ) |
330 | int offsetX = w->x() - w->geometry().left(); | 331 | int offsetX = w->x() - w->geometry().left(); |
331 | int offsetY = w->y() - w->geometry().top(); | 332 | int offsetY = w->y() - w->geometry().top(); |
332 | 333 | ||
@@ -337,16 +338,17 @@ public: | |||
337 | r = w->geometry(); | 338 | r = w->geometry(); |
338 | 339 | ||
339 | // Stores the window placement as pos(), size() (due to the offset mapping) | 340 | // Stores the window placement as pos(), size() (due to the offset mapping) |
340 | Config cfg( "qpe" ); | 341 | Config cfg( "qpe" ); |
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 | { |
349 | /* | 351 | /* |
350 | // This works but disable it for now until it is safe to apply | 352 | // This works but disable it for now until it is safe to apply |
351 | // What is does is scan the .desktop files of all the apps for | 353 | // What is does is scan the .desktop files of all the apps for |
352 | // the applnk that has the corresponding argv[0] as this program | 354 | // 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 ) | |||
47 | } | 47 | } |
48 | 48 | ||
49 | void QPEApplication::showWidget( QWidget* wg, bool nomax ) { | 49 | void QPEApplication::showWidget( QWidget* wg, bool nomax ) { |
50 | if ( wg->isVisible() ) { | 50 | if ( wg->isVisible() ) { |
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() ); |
61 | #else | 65 | #else |
62 | QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() ); | 66 | QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() ); |
63 | #endif | 67 | #endif |
64 | 68 | ||