Sync with upstream mobilecomponents

This updates to the state of bf7914b67c45e

Signed-off-by: Sebastian Kügler <sebas@kde.org>
This commit is contained in:
Sebastian Kügler 2015-11-29 18:56:21 +01:00
parent 6ffef818a8
commit 5e5c9830a4
4 changed files with 20 additions and 9 deletions

View file

@ -59,10 +59,6 @@ Rectangle {
target: flickable
property real oldContentY: flickable.contentY
onContentYChanged: {
print(flickable.contentY+" "+actionButton.transform[0] )
if (flickable.atYBeginning || flickable.atYEnd) {
return;
}
actionButton.transform[0].y = Math.min(actionButton.height, Math.max(0, actionButton.transform[0].y + (flickable.contentY - oldContentY)));
oldContentY = flickable.contentY;