summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-08-25 11:01:04 (UTC)
committer mickeyl <mickeyl>2005-08-25 11:01:04 (UTC)
commit193c968b94fd6db646af8a3588e90982a20e3fc5 (patch) (side-by-side diff)
treec3b8e484b522bb10c1a6a9f65bb72bc421ac8479
parent938d1f0a0c16a8acbd7866191d099a4054c4c3e2 (diff)
downloadopie-193c968b94fd6db646af8a3588e90982a20e3fc5.zip
opie-193c968b94fd6db646af8a3588e90982a20e3fc5.tar.gz
opie-193c968b94fd6db646af8a3588e90982a20e3fc5.tar.bz2
revert last change which made dialogs appear as small windows on 240x320 models
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 286c6ef..19e99f2 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -190,71 +190,71 @@ public:
// event loop can come around again before getting
// back from sendLocally
#ifndef QT_NO_COP
QCopChannel::sendLocally( r->channel, r->message, r->data );
#endif
delete r;
}
}
static void show_mx(QWidget* mw, bool nomaximize, QString &strName) {
if ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") )
{
( ( QMainWindow* ) mw )->setUsesBigPixmaps( useBigPixmaps );
}
QPoint p;
QSize s;
bool max;
if ( mw->isVisible() ) {
if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
mw->resize(s);
mw->move(p);
}
mw->raise();
} else {
if ( mw->layout() && mw->inherits("QDialog") ) {
if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
mw->resize(s);
mw->move(p);
- if ( max && !nomaximize ) {
- mw->showMaximized();
- } else {
- mw->show();
+ if ( max && !nomaximize ) {
+ mw->showMaximized();
+ } else {
+ mw->show();
}
} else {
- QPEApplication::showDialog((QDialog*)mw, !nomaximize);
+ QPEApplication::showDialog((QDialog*)mw,nomaximize);
}
} else {
if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
mw->resize(s);
mw->move(p);
} else { //no stored rectangle, make an estimation
int x = (qApp->desktop()->width()-mw->frameGeometry().width())/2;
int y = (qApp->desktop()->height()-mw->frameGeometry().height())/2;
mw->move( QMAX(x,0), QMAX(y,0) );
#ifdef Q_WS_QWS
if ( !nomaximize )
mw->showMaximized();
#endif
}
if ( max && !nomaximize )
mw->showMaximized();
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");