Fix QQuickItemPrivate::(width|height)Valid usage

Change-Id: I7c04a800210abbdbbb01b399964be7c42cf7f9c5
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>

7 files changed, 43 insertions, 14 deletions

diff --git a/src/controls/qquickabstractapplicationwindow.cpp b/src/controls/qquickabstractapplicationwindow.cpp
index 1ac37d7e..c5045e77 100644
--- a/src/controls/qquickabstractapplicationwindow.cpp
+++ b/src/controls/qquickabstractapplicationwindow.cpp
@@ -217,13 +217,17 @@ void QQuickAbstractApplicationWindow::resizeEvent(QResizeEvent *event)
     Q_D(QQuickAbstractApplicationWindow);
     if (d->header) {
         QQuickItemPrivate *p = QQuickItemPrivate::get(d->header);
-        if (!p->widthValid || qFuzzyCompare(d->header->width(), event->oldSize().width()))
+        if (!p->widthValid) {
             d->header->setWidth(width());
+            p->widthValid = false;
+        }
     }
     if (d->footer) {
         QQuickItemPrivate *p = QQuickItemPrivate::get(d->footer);
-        if (!p->widthValid || qFuzzyCompare(d->footer->width(), event->oldSize().width()))
+        if (!p->widthValid) {
             d->footer->setWidth(width());
+            p->widthValid = false;
+        }
     }
     d->relayout();
 }
diff --git a/src/controls/qquickabstractscrollbar.cpp b/src/controls/qquickabstractscrollbar.cpp
index 09ccace6..e1036bd0 100644
--- a/src/controls/qquickabstractscrollbar.cpp
+++ b/src/controls/qquickabstractscrollbar.cpp
@@ -319,15 +319,19 @@ void QQuickScrollBarAttachedPrivate::itemGeometryChanged(QQuickItem *item, const
     Q_ASSERT(item == flickable);
     if (horizontal) {
         QQuickItemPrivate *p = QQuickItemPrivate::get(horizontal);
-        if (!p->widthValid || qFuzzyCompare(horizontal->width(), oldGeometry.width()))
+        if (!p->widthValid) {
             horizontal->setWidth(newGeometry.width());
+            p->widthValid = false;
+        }
         if (qFuzzyIsNull(horizontal->y()) || qFuzzyCompare(horizontal->y(), oldGeometry.height() - horizontal->height()))
             horizontal->setY(newGeometry.height() - horizontal->height());
     }
     if (vertical) {
         QQuickItemPrivate *p = QQuickItemPrivate::get(vertical);
-        if (!p->heightValid || qFuzzyCompare(vertical->height(), oldGeometry.height()))
+        if (!p->heightValid) {
             vertical->setHeight(newGeometry.height());
+            p->heightValid = false;
+        }
         if (!p->isMirrored() && (qFuzzyIsNull(vertical->x()) || qFuzzyCompare(vertical->x(), oldGeometry.width() - vertical->width())))
             vertical->setX(newGeometry.width() - vertical->width());
     }
diff --git a/src/controls/qquickabstractscrollindicator.cpp b/src/controls/qquickabstractscrollindicator.cpp
index a68cc6b4..93d7917e 100644
--- a/src/controls/qquickabstractscrollindicator.cpp
+++ b/src/controls/qquickabstractscrollindicator.cpp
@@ -214,15 +214,19 @@ void QQuickScrollIndicatorAttachedPrivate::itemGeometryChanged(QQuickItem *item,
     Q_ASSERT(item == flickable);
     if (horizontal) {
         QQuickItemPrivate *p = QQuickItemPrivate::get(horizontal);
-        if (!p->widthValid || qFuzzyCompare(horizontal->width(), oldGeometry.width()))
+        if (!p->widthValid) {
             horizontal->setWidth(newGeometry.width());
+            p->widthValid = false;
+        }
         if (qFuzzyIsNull(horizontal->y()) || qFuzzyCompare(horizontal->y(), oldGeometry.height() - horizontal->height()))
             horizontal->setY(newGeometry.height() - horizontal->height());
     }
     if (vertical) {
         QQuickItemPrivate *p = QQuickItemPrivate::get(vertical);
-        if (!p->heightValid || qFuzzyCompare(vertical->height(), oldGeometry.height()))
+        if (!p->heightValid) {
             vertical->setHeight(newGeometry.height());
+            p->heightValid = false;
+        }
         if (!p->isMirrored() && (qFuzzyIsNull(vertical->x()) || qFuzzyCompare(vertical->x(), oldGeometry.width() - vertical->width())))
             vertical->setX(newGeometry.width() - vertical->width());
     }
diff --git a/src/controls/qquickabstracttabview.cpp b/src/controls/qquickabstracttabview.cpp
index d9ae0090..8a0aa7ac 100644
--- a/src/controls/qquickabstracttabview.cpp
+++ b/src/controls/qquickabstracttabview.cpp
@@ -131,8 +131,13 @@ void QQuickAbstractTabView::geometryChanged(const QRectF &newGeometry, const QRe
 {
     Q_D(QQuickAbstractTabView);
     QQuickControl::geometryChanged(newGeometry, oldGeometry);
-    if (d->bar && (!d->bar->widthValid() || qFuzzyCompare(d->bar->width(), oldGeometry.width())))
-        d->bar->setWidth(newGeometry.width());
+    if (d->bar) {
+        QQuickItemPrivate *p = QQuickItemPrivate::get(d->bar);
+        if (!p->widthValid) {
+            d->bar->setWidth(newGeometry.width());
+            p->widthValid = false;
+        }
+    }
 }
 
 /*!
diff --git a/src/controls/qquickabstracttextarea.cpp b/src/controls/qquickabstracttextarea.cpp
index 8f4219d6..f2ab95bf 100644
--- a/src/controls/qquickabstracttextarea.cpp
+++ b/src/controls/qquickabstracttextarea.cpp
@@ -110,10 +110,14 @@ void QQuickAbstractTextArea::geometryChanged(const QRectF &newGeometry, const QR
     QQuickTextEdit::geometryChanged(newGeometry, oldGeometry);
     if (d->background) {
         QQuickItemPrivate *p = QQuickItemPrivate::get(d->background);
-        if (!p->widthValid || qFuzzyCompare(d->background->width(), oldGeometry.width()))
+        if (!p->widthValid) {
             d->background->setWidth(newGeometry.width());
-        if (!p->heightValid || qFuzzyCompare(d->background->height(), oldGeometry.height()))
+            p->widthValid = false;
+        }
+        if (!p->heightValid) {
             d->background->setHeight(newGeometry.height());
+            p->heightValid = false;
+        }
     }
 }
 
diff --git a/src/controls/qquickabstracttextfield.cpp b/src/controls/qquickabstracttextfield.cpp
index 82825ce4..b7b35a5d 100644
--- a/src/controls/qquickabstracttextfield.cpp
+++ b/src/controls/qquickabstracttextfield.cpp
@@ -110,10 +110,14 @@ void QQuickAbstractTextField::geometryChanged(const QRectF &newGeometry, const Q
     QQuickTextInput::geometryChanged(newGeometry, oldGeometry);
     if (d->background) {
         QQuickItemPrivate *p = QQuickItemPrivate::get(d->background);
-        if (!p->widthValid || qFuzzyCompare(d->background->width(), oldGeometry.width()))
+        if (!p->widthValid) {
             d->background->setWidth(newGeometry.width());
-        if (!p->heightValid || qFuzzyCompare(d->background->height(), oldGeometry.height()))
+            p->widthValid = false;
+        }
+        if (!p->heightValid) {
             d->background->setHeight(newGeometry.height());
+            p->heightValid = false;
+        }
     }
 }
 
diff --git a/src/controls/qquickcontrol.cpp b/src/controls/qquickcontrol.cpp
index 61389ad6..72050811 100644
--- a/src/controls/qquickcontrol.cpp
+++ b/src/controls/qquickcontrol.cpp
@@ -261,10 +261,14 @@ void QQuickControl::geometryChanged(const QRectF &newGeometry, const QRectF &old
     QQuickItem::geometryChanged(newGeometry, oldGeometry);
     if (d->background) {
         QQuickItemPrivate *p = QQuickItemPrivate::get(d->background);
-        if (!p->widthValid || qFuzzyCompare(d->background->width(), oldGeometry.width()))
+        if (!p->widthValid) {
             d->background->setWidth(newGeometry.width());
-        if (!p->heightValid || qFuzzyCompare(d->background->height(), oldGeometry.height()))
+            p->widthValid = false;
+        }
+        if (!p->heightValid) {
             d->background->setHeight(newGeometry.height());
+            p->heightValid = false;
+        }
     }
 }