projects
/
profile
/
ivi
/
qtdeclarative.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix emitting originYChanged signals even when originY wouldn't change
[profile/ivi/qtdeclarative.git]
/
src
/
quick
/
items
/
qquickflickable.cpp
diff --git
a/src/quick/items/qquickflickable.cpp
b/src/quick/items/qquickflickable.cpp
index
0a8e220
..
a15f77d
100644
(file)
--- a/
src/quick/items/qquickflickable.cpp
+++ b/
src/quick/items/qquickflickable.cpp
@@
-540,12
+540,20
@@
void QQuickFlickablePrivate::updateBeginningEnd()
if (vData.extentsChanged) {
vData.extentsChanged = false;
if (vData.extentsChanged) {
vData.extentsChanged = false;
- emit q->originYChanged();
+ qreal originY = q->originY();
+ if (vData.origin != originY) {
+ vData.origin = originY;
+ emit q->originYChanged();
+ }
}
if (hData.extentsChanged) {
hData.extentsChanged = false;
}
if (hData.extentsChanged) {
hData.extentsChanged = false;
- emit q->originXChanged();
+ qreal originX = q->originX();
+ if (hData.origin != originX) {
+ hData.origin = originX;
+ emit q->originXChanged();
+ }
}
if (atBoundaryChange)
}
if (atBoundaryChange)