summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-01-20 11:17:02 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-02-03 05:56:07 +0000
commiteb92a531c0bb237613f3f4948048e61af83dad77 (patch)
tree5d065e99352a7b469066ddf7d12169aacec0e8f3 /src/widgets/kernel
parentc88e354993f8db3da741b1492f7578e9e0fdb07f (diff)
QWindowContainer: Restrict check for negative position to child windows.
Otherwise, the code triggers for top level windows in setups with multimonitors where the primary screen is on the right and the left monitor has negative coordinates. Task-number: QTBUG-43879 Task-number: QTBUG-38475 Change-Id: Ied3ee6dc59bd784e11db22031d2090cc6f42ef8b Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
Diffstat (limited to 'src/widgets/kernel')
-rw-r--r--src/widgets/kernel/qwindowcontainer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwindowcontainer.cpp b/src/widgets/kernel/qwindowcontainer.cpp
index 34cfb2d99f..5460a43ef4 100644
--- a/src/widgets/kernel/qwindowcontainer.cpp
+++ b/src/widgets/kernel/qwindowcontainer.cpp
@@ -64,7 +64,7 @@ public:
void updateGeometry() {
Q_Q(QWindowContainer);
- if (q->geometry().bottom() <= 0 || q->geometry().right() <= 0)
+ if (!q->isWindow() && (q->geometry().bottom() <= 0 || q->geometry().right() <= 0))
/* Qt (e.g. QSplitter) sometimes prefer to hide a widget by *not* calling
setVisible(false). This is often done by setting its coordinates to a sufficiently
negative value so that its clipped outside the parent. Since a QWindow is not clipped