diff options
author | Sebastian Kügler <sebas@kde.org> | 2015-11-30 02:35:17 +0100 |
---|---|---|
committer | Sebastian Kügler <sebas@kde.org> | 2015-11-30 02:53:21 +0100 |
commit | f8fb9181b2e95f76bb1170d2cd7c7bf920a9c414 (patch) | |
tree | e2245279f179b4e85f81b1736b8bb0143013dbf8 /qt-mobile/qml/mobilecomponents/GlobalDrawer.qml | |
parent | 6381c2eb2a79be8ca799f65c0b69a894292a8be6 (diff) | |
download | subsurface-f8fb9181b2e95f76bb1170d2cd7c7bf920a9c414.tar.gz |
sync with mobilecomponents 68c6dc9
This fixes spacing around the icon in the left drawer, the stretched-out
icons in the navigation menu, the unnecessary scrolling in the same
menu, and a few other things.
Signed-off-by: Sebastian Kügler <sebas@kde.org>
Diffstat (limited to 'qt-mobile/qml/mobilecomponents/GlobalDrawer.qml')
-rw-r--r-- | qt-mobile/qml/mobilecomponents/GlobalDrawer.qml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml b/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml index 363042505..638222ada 100644 --- a/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml +++ b/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml @@ -84,7 +84,7 @@ OverlayDrawer { anchors { left: parent.left top: parent.top - margins: Units.smallSpacing + margins: Units.smallSpacing * 2 } Icon { id: headingIcon @@ -140,6 +140,8 @@ OverlayDrawer { model: actions property int level: 0 + interactive: contentHeight > height + footer: ListItem { visible: level > 0 enabled: true @@ -149,7 +151,8 @@ OverlayDrawer { left: parent.left } Icon { - Layout.maximumWidth: height + Layout.minimumWidth: height + Layout.maximumWidth: Layout.minimumWidth Layout.fillHeight: true source: "go-previous" } @@ -179,7 +182,8 @@ OverlayDrawer { text: modelData.text } Icon { - Layout.maximumWidth: height + Layout.minimumWidth: height + Layout.maximumWidth: Layout.minimumWidth Layout.fillHeight: true source: "go-next" visible: modelData.children != undefined |