From 5163d524dbad1d2c9f8f3cfd1d9cccbdcce98708 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Mon, 28 Jul 2014 20:37:35 +0200 Subject: QQuickPopupWindow: Use actual item size as content size Using the children rect size was a mistake, particularly when using Instantator in a Menu. Task-number: QTBUG-40221 Change-Id: I6efe9aad617a7b0adbea0bb96bf843c5c1779131 Reviewed-by: J-P Nurmi --- src/controls/qquickmenupopupwindow.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/controls/qquickmenupopupwindow.cpp') diff --git a/src/controls/qquickmenupopupwindow.cpp b/src/controls/qquickmenupopupwindow.cpp index c8483d63..508b6b27 100644 --- a/src/controls/qquickmenupopupwindow.cpp +++ b/src/controls/qquickmenupopupwindow.cpp @@ -126,12 +126,11 @@ void QQuickMenuPopupWindow::setGeometry(int posx, int posy, int w, int h) void QQuickMenuPopupWindow::updateSize() { - QSize contentSize = popupContentItem()->childrenRect().size().toSize(); qreal x = m_initialPos.x(); qreal y = m_initialPos.y(); if (qGuiApp->layoutDirection() == Qt::RightToLeft) - x -= contentSize.width(); - setGeometry(x, y, contentSize.width(), contentSize.height()); + x -= popupContentItem()->width(); + setGeometry(x, y, popupContentItem()->width(), popupContentItem()->height()); } void QQuickMenuPopupWindow::updatePosition() -- cgit v1.2.1