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>
This commit is contained in:
Sebastian Kügler 2015-12-08 02:32:03 +01:00
parent 946cc5fec2
commit 44fd9bff67
4 changed files with 10 additions and 4 deletions

View file

@ -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)));