diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /src/gui/kernel/qplatformwindow.cpp | |
parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'src/gui/kernel/qplatformwindow.cpp')
-rw-r--r-- | src/gui/kernel/qplatformwindow.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index 4c0d68e7c1..1f9183db44 100644 --- a/src/gui/kernel/qplatformwindow.cpp +++ b/src/gui/kernel/qplatformwindow.cpp @@ -167,7 +167,7 @@ bool QPlatformWindow::isExposed() const } /*! - Returns true if the window should appear active from a style perspective. + Returns \c true if the window should appear active from a style perspective. This function can make platform-specific isActive checks, such as checking if the QWindow is embedded in an active native window. @@ -178,7 +178,7 @@ bool QPlatformWindow::isActive() const } /*! - Returns true if the window is a descendant of an embedded non-Qt window. + Returns \c true if the window is a descendant of an embedded non-Qt window. Example of an embedded non-Qt window is the parent window of an in-process QAxServer. If \a parentWindow is nonzero, only check if the window is embedded in the @@ -509,7 +509,8 @@ QRect QPlatformWindow::initialGeometry(const QWindow *w, rect.setHeight(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) { if (const QPlatformScreen *platformScreen = QPlatformScreen::platformScreenForWindow(w)) { const QRect availableGeometry = platformScreen->availableGeometry(); // Center unless the geometry ( + unknown window frame) is too large for the screen). |