2 files changed, 19 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 124b8c5b..d343fad6 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -128,6 +128,7 @@ QQuickPopupPrivate::QQuickPopupPrivate()
     , hasDim(false)
     , visible(false)
     , complete(false)
+    , positioning(false)
     , hasWidth(false)
     , hasHeight(false)
     , hasTopMargin(false)
@@ -401,6 +402,12 @@ QQuickPopupItem::QQuickPopupItem(QQuickPopup *popup) :
     // connect(QGuiApplication::styleHints(), &QStyleHints::useHoverEffectsChanged, this, &QQuickItem::setAcceptHoverEvents);
 }
 
+void QQuickPopupItem::updatePolish()
+{
+    Q_D(QQuickPopupItem);
+    return QQuickPopupPrivate::get(d->popup)->reposition();
+}
+
 bool QQuickPopupItem::childMouseEventFilter(QQuickItem *child, QEvent *event)
 {
     Q_D(QQuickPopupItem);
@@ -594,6 +601,11 @@ void QQuickPopupPrivate::reposition()
     if (!popupItem->isVisible())
         return;
 
+    if (positioning) {
+        popupItem->polish();
+        return;
+    }
+
     const qreal w = popupItem->width();
     const qreal h = popupItem->height();
     const qreal iw = popupItem->implicitWidth();
@@ -702,6 +714,8 @@ void QQuickPopupPrivate::reposition()
         }
     }
 
+    positioning = true;
+
     popupItem->setPosition(rect.topLeft());
 
     const QPointF effectivePos = parentItem ? parentItem->mapFromScene(rect.topLeft()) : rect.topLeft();
@@ -718,6 +732,8 @@ void QQuickPopupPrivate::reposition()
         popupItem->setWidth(rect.width());
     if (!hasHeight && heightAdjusted && rect.height() > 0)
         popupItem->setHeight(rect.height());
+
+    positioning = false;
 }
 
 void QQuickPopupPrivate::resizeOverlay()
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
index c8c83ada..d2f16e11 100644
--- a/src/quicktemplates2/qquickpopup_p_p.h
+++ b/src/quicktemplates2/qquickpopup_p_p.h
@@ -87,6 +87,8 @@ public:
     explicit QQuickPopupItem(QQuickPopup *popup);
 
 protected:
+    void updatePolish() override;
+
     bool childMouseEventFilter(QQuickItem *child, QEvent *event) override;
     void focusInEvent(QFocusEvent *event) override;
     void focusOutEvent(QFocusEvent *event) override;
@@ -185,6 +187,7 @@ public:
     bool hasDim;
     bool visible;
     bool complete;
+    bool positioning;
     bool hasWidth;
     bool hasHeight;
     bool hasTopMargin;