diff options
Diffstat (limited to 'src/widgets/kernel/qwidget_qpa.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget_qpa.cpp | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index 289b332a13..a37de8547a 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -424,6 +424,19 @@ void QWidget::activateWindow() windowHandle()->requestActivateWindow(); } +// Position top level windows at the center, avoid showing +// Windows at the default 0,0 position excluding the frame. +static inline QRect positionTopLevelWindow(QRect geometry, const QScreen *screen) +{ + if (screen && geometry.x() == 0 && geometry.y() == 0) { + const QRect availableGeometry = screen->availableGeometry(); + if (availableGeometry.width() > geometry.width() + && availableGeometry.height() > geometry.height()) + geometry.moveCenter(availableGeometry.center()); + } + return geometry; +} + void QWidgetPrivate::show_sys() { Q_Q(QWidget); @@ -441,7 +454,10 @@ void QWidgetPrivate::show_sys() QWindow *window = q->windowHandle(); if (window) { QRect geomRect = q->geometry(); - if (!q->isWindow()) { + if (q->isWindow()) { + if (!q->testAttribute(Qt::WA_Moved)) + geomRect = positionTopLevelWindow(geomRect, window->screen()); + } else { QPoint topLeftOfWindow = q->mapTo(q->nativeParentWidget(),QPoint()); geomRect.moveTopLeft(topLeftOfWindow); } @@ -483,7 +499,15 @@ void QWidgetPrivate::hide_sys() void QWidgetPrivate::setMaxWindowState_helper() { - setFullScreenSize_helper(); //### decoration size + Q_Q(QWidget); + + const uint old_state = data.in_set_window_state; + data.in_set_window_state = 1; + + const QRect desktop = qApp->desktop()->availableGeometry(qApp->desktop()->screenNumber(q)); + q->setGeometry(desktop); + + data.in_set_window_state = old_state; } void QWidgetPrivate::setFullScreenSize_helper() |