diff options
| author |  Sebastian Kügler <sebas@kde.org> | 2015-12-08 02:32:03 +0100 |
|---|---|---|
| committer | Sebastian Kügler <sebas@kde.org> | 2015-12-08 04:55:56 +0100 |
| commit | 44fd9bff6776de3a7b66e8b33412a554551c50c3 (patch) | |
| tree | 08bb00645c69fe4683cfbb4f9593bb479ad02d24 /qt-mobile/qml/mobilecomponents/Page.qml | |
| parent | 946cc5fec2bc17e1a31856571e1715c0d22230a8 (diff) | |
| download | subsurface-44fd9bff6776de3a7b66e8b33412a554551c50c3.tar.gz | |
sync with mobilecomponents f4d5d19fc
- Kills a warning in ContextDrawer.
- Improves sizing of menu icons.
- Fixes icon rendering in menues.
Signed-off-by: Sebastian Kügler <sebas@kde.org>
Diffstat (limited to 'qt-mobile/qml/mobilecomponents/Page.qml')
| -rw-r--r-- | qt-mobile/qml/mobilecomponents/Page.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qt-mobile/qml/mobilecomponents/Page.qml b/qt-mobile/qml/mobilecomponents/Page.qml index 784ce8037..f55c24faa 100644 --- a/qt-mobile/qml/mobilecomponents/Page.qml +++ b/qt-mobile/qml/mobilecomponents/Page.qml @@ -57,7 +57,7 @@ Rectangle { Connections { target: flickable - property real oldContentY: flickable.contentY + property real oldContentY: (flickable == null) ? 0 : flickable.contentY onContentYChanged: { actionButton.transform[0].y = Math.min(actionButton.height, Math.max(0, actionButton.transform[0].y + (flickable.contentY - oldContentY))); |