| -rw-r--r-- | library/qpeapplication.cpp | 60 |
1 files changed, 1 insertions, 59 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index e1edd4c..df313ce 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -227,5 +227,5 @@ public: } } else { - qpe_show_dialog((QDialog*)mw,nomaximize); + QPEApplication::showDialog((QDialog*)mw,nomaximize); } } else { @@ -250,62 +250,4 @@ public: } -static void qpe_show_dialog( QDialog* d, bool nomax ) -{ - QSize sh = d->sizeHint(); - int w = QMAX(sh.width(),d->width()); - int h = QMAX(sh.height(),d->height()); - - if ( d->parentWidget() && !d->parentWidget()->topLevelWidget()->isMaximized() ) - nomax = TRUE; - -#ifndef Q_WS_QWS - QSize s(qApp->desktop()->width(), qApp->desktop()->height() ); -#else - QSize s(qt_maxWindowRect.width(), qt_maxWindowRect.height() ); -#endif - - int maxX = s.width() - (d->frameGeometry().width() - d->geometry().width()); - int maxY = s.height() - (d->frameGeometry().height() - d->geometry().height()); - - if ( (w >= maxX && h >= maxY) || ( (!nomax) && ( w > s.width()*3/4 || h > s.height()*3/4 ) ) ) { - d->showMaximized(); - } else { - // try centering the dialog around its parent - QPoint p(0,0); - if ( d->parentWidget() ) { - QPoint pp = d->parentWidget()->mapToGlobal( QPoint(0,0) ); - p = QPoint( pp.x() + d->parentWidget()->width()/2, - pp.y() + d->parentWidget()->height()/ 2 ); - } else { - p = QPoint( maxX/2, maxY/2 ); - } - - p = QPoint( p.x() - w/2, p.y() - h/2 ); -// qDebug("p(x,y) is %d %d", p.x(), p.y() ); - - if ( w >= maxX ) { - if ( p.y() < 0 ) - p.setY(0); - if ( p.y() + h > maxY ) - p.setY( maxY - h); - - d->resize(maxX, h); - d->move(0, p.y() ); - } else if ( h >= maxY ) { - if ( p.x() < 0 ) - p.setX(0); - if ( p.x() + w > maxX ) - p.setX( maxX - w); - - d->resize(w, maxY); - d->move(p.x(),0); - } else { - d->resize(w, h); - } - - d->show(); - } -} - static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s) { |