aboutsummaryrefslogtreecommitdiffstats
path: root/src/controls/qquickabstracttextarea.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-03-13 17:42:19 +0100
committerJari-Pekka Nurmi <jpnurmi@theqtcompany.com>2015-03-13 18:43:08 +0200
commitbca36a6602a5e2d3f00ce2df1300d608b6220a59 (patch)
tree06ec9d9a22cabcc8c976ef8d8f81370d47883687 /src/controls/qquickabstracttextarea.cpp
parent15cd326a05d4f92c780a9357f3e715e1bd02989e (diff)
Fix QQuickItemPrivate::(width|height)Valid usage
Change-Id: I7c04a800210abbdbbb01b399964be7c42cf7f9c5 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/qquickabstracttextarea.cpp')
-rw-r--r--src/controls/qquickabstracttextarea.cpp8
1 files changed, 6 insertions, 2 deletions
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;
+ }
}
}