diff options
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 3828c89dbf..2e74c59c20 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -246,23 +246,27 @@ void QQuickWindow::focusInEvent(QFocusEvent *ev) d->updateFocusItemTransform(); } - void QQuickWindowPrivate::polishItems() { int maxPolishCycles = 100000; - while (!itemsToPolish.isEmpty() && --maxPolishCycles > 0) { + int removedItems; + do { + removedItems = 0; QSet<QQuickItem *> itms = itemsToPolish; - itemsToPolish.clear(); for (QSet<QQuickItem *>::iterator it = itms.begin(); it != itms.end(); ++it) { QQuickItem *item = *it; QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item); - itemPrivate->polishScheduled = false; - if (item->isVisible() || (itemPrivate->extra.isAllocated() && itemPrivate->extra->effectRefCount>0)) + + if (item->isVisible() || (itemPrivate->extra.isAllocated() && itemPrivate->extra->effectRefCount>0)) { + itemPrivate->polishScheduled = false; + itemsToPolish.remove(item); item->updatePolish(); + ++removedItems; + } } - } + } while (removedItems > 0 && --maxPolishCycles > 0); if (maxPolishCycles == 0) qWarning("QQuickWindow: possible QQuickItem::polish() loop"); |