1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QPlatformWindow::initialGeometry(): Pass screen when scaling.

Browse Source 
Otherwise, the window may up outside the display area when centering
on a secondary screen and the primary screen has a different scale factor.

Task-number: QTBUG-49803
Change-Id: I91ec7c5348722a90012f80a247e662e96bcbb391
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2015-12-07 12:44:09 +01:00
parent df57e3a33f
commit 4ad8798de4
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/gui/kernel/qplatformwindow.cpp
View File

@ -581,6 +581,9 @@ void QPlatformWindow::invalidateSurface()
QRect QPlatformWindow::initialGeometry(const QWindow *w, QRect QPlatformWindow::initialGeometry(const QWindow *w,
const QRect &initialGeometry, int defaultWidth, int defaultHeight) const QRect &initialGeometry, int defaultWidth, int defaultHeight)
{ {
const QScreen *screen = effectiveScreen(w);
if (!screen)
return initialGeometry;
QRect rect(QHighDpi::fromNativePixels(initialGeometry, w)); QRect rect(QHighDpi::fromNativePixels(initialGeometry, w));
if (rect.width() == 0) { if (rect.width() == 0) {
const int minWidth = w->minimumWidth(); const int minWidth = w->minimumWidth();
@ -591,25 +594,23 @@ QRect QPlatformWindow::initialGeometry(const QWindow *w,
rect.setHeight(minHeight > 0 ? minHeight : defaultHeight); rect.setHeight(minHeight > 0 ? minHeight : defaultHeight);
} }
if (w->isTopLevel() && qt_window_private(const_cast<QWindow*>(w))->positionAutomatic if (w->isTopLevel() && qt_window_private(const_cast<QWindow*>(w))->positionAutomatic
&& w->type() != Qt::Popup) { && w->type() != Qt::Popup) {
if (const QScreen *screen = effectiveScreen(w)) { const QRect availableGeometry = screen->availableGeometry();
const QRect availableGeometry = screen->availableGeometry(); // Center unless the geometry ( + unknown window frame) is too large for the screen).
// Center unless the geometry ( + unknown window frame) is too large for the screen). if (rect.height() < (availableGeometry.height() * 8) / 9
if (rect.height() < (availableGeometry.height() * 8) / 9
&& rect.width() < (availableGeometry.width() * 8) / 9) { && rect.width() < (availableGeometry.width() * 8) / 9) {
const QWindow *tp = w->transientParent(); const QWindow *tp = w->transientParent();
if (tp) { if (tp) {
// A transient window should be centered w.r.t. its transient parent. // A transient window should be centered w.r.t. its transient parent.
rect.moveCenter(tp->geometry().center()); rect.moveCenter(tp->geometry().center());
} else { } else {
// Center the window on the screen. (Only applicable on platforms // Center the window on the screen. (Only applicable on platforms
// which do not provide a better way.) // which do not provide a better way.)
rect.moveCenter(availableGeometry.center()); rect.moveCenter(availableGeometry.center());
}
} }
} }
} }
return QHighDpi::toNativePixels(rect, w); return QHighDpi::toNativePixels(rect, screen);
} }
/*! /*!