qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QQuickItem: fix binding loops for x, y, width, and height 

Use {set}ValueBypassingBinding() to read and write the value of the
property.
Use valueBypassingBinding() to get the values of other realted
properties before calling geometryChanged().

The tests for these bindable properties already exist. They will detect
the binding loops as soon as the related qtbase patch is merged.

Fixes: QTBUG-116540
Pick-to: 6.6 6.5
Change-Id: Ifb6caac2d5176fa6985a170fcdfe0dceeac10936
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Ivan Solovev 2023-09-18 15:16:12 +02:00
parent e47430ad26
commit f85de75735
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/quick/items/qquickitem.cpp
View File

@ -7071,15 +7071,17 @@ void QQuickItem::setX(qreal v)
if (qt_is_nan(v))
return;
const qreal oldx = d->x;
const qreal oldx = d->x.valueBypassingBindings();
if (oldx == v)
return;
d->x = v;
d->x.setValueBypassingBindings(v);
d->dirty(QQuickItemPrivate::Position);
const qreal y = d->y, w = d->width, h = d->height;
const qreal y = d->y.valueBypassingBindings();
const qreal w = d->width.valueBypassingBindings();
const qreal h = d->height.valueBypassingBindings();
geometryChange(QRectF(v, y, w, h), QRectF(oldx, y, w, h));
}
@ -7090,17 +7092,19 @@ void QQuickItem::setY(qreal v)
if (qt_is_nan(v))
return;
const qreal oldy = d->y;
const qreal oldy = d->y.valueBypassingBindings();
if (oldy == v)
return;
d->y = v;
d->y.setValueBypassingBindings(v);
d->dirty(QQuickItemPrivate::Position);
// we use v instead of d->y, as that avoid a method call
// and we have v anyway in scope
const qreal x = d->x, w = d->width, h = d->height;
const qreal x = d->x.valueBypassingBindings();
const qreal w = d->width.valueBypassingBindings();
const qreal h = d->height.valueBypassingBindings();
geometryChange(QRectF(x, v, w, h), QRectF(x, oldy, w, h));
}
@ -7170,15 +7174,17 @@ void QQuickItem::setWidth(qreal w)
return;
d->widthValidFlag = true;
const qreal oldWidth = d->width;
const qreal oldWidth = d->width.valueBypassingBindings();
if (oldWidth == w)
return;
d->width = w;
d->width.setValueBypassingBindings(w);
d->dirty(QQuickItemPrivate::Size);
const qreal x = d->x, y = d->y, h = d->height;
const qreal x = d->x.valueBypassingBindings();
const qreal y = d->y.valueBypassingBindings();
const qreal h = d->height.valueBypassingBindings();
geometryChange(QRectF(x, y, w, h), QRectF(x, y, oldWidth, h));
}
@ -7376,15 +7382,17 @@ void QQuickItem::setHeight(qreal h)
return;
d->heightValidFlag = true;
const qreal oldHeight = d->height;
const qreal oldHeight = d->height.valueBypassingBindings();
if (oldHeight == h)
return;
d->height = h;
d->height.setValueBypassingBindings(h);
d->dirty(QQuickItemPrivate::Size);
const qreal x = d->x, y = d->y, w = d->width;
const qreal x = d->x.valueBypassingBindings();
const qreal y = d->y.valueBypassingBindings();
const qreal w = d->width.valueBypassingBindings();
geometryChange(QRectF(x, y, w, h), QRectF(x, y, w, oldHeight));
}