sync with mobilecomponents e7d789465b9a935ec

This fixes lack of spacing in the drawer's menu items.

Signed-off-by: Sebastian Kügler <sebas@kde.org>

2 files changed, 9 insertions, 3 deletions

diff --git a/qt-mobile/qml/mobilecomponents/ContextDrawer.qml b/qt-mobile/qml/mobilecomponents/ContextDrawer.qml
index 2e2f95f7e..083254946 100644
--- a/qt-mobile/qml/mobilecomponents/ContextDrawer.qml
+++ b/qt-mobile/qml/mobilecomponents/ContextDrawer.qml
@@ -18,6 +18,7 @@
  */
 
 import QtQuick 2.1
+import QtQuick.Layouts 1.2
 import QtQuick.Controls 1.0 as QtControls
 import org.kde.plasma.mobilecomponents 0.2
 
@@ -63,7 +64,8 @@ OverlayDrawer {
             }
             delegate: ListItem {
                 enabled: true
-                Row {
+                RowLayout {
+                    height: implicitHeight + Units.smallSpacing * 2
                     anchors {
                         left: parent.left
                         margins: Units.largeSpacing
diff --git a/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml b/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml
index 082231c41..363042505 100644
--- a/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml
+++ b/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml
@@ -49,6 +49,7 @@ OverlayDrawer {
             Layout.minimumHeight: Math.max(headingIcon.height, heading.height) + Units.smallSpacing*2
 
             fillMode: Image.PreserveAspectCrop
+            asynchronous: true
 
             anchors {
                 left: parent.left
@@ -123,6 +124,7 @@ OverlayDrawer {
             Layout.maximumWidth: Layout.minimumWidth
             Layout.fillWidth: false
             Layout.fillHeight: true
+            visible: children.length > 0
         }
         Item {
             Layout.minimumWidth: Units.smallSpacing
@@ -142,6 +144,7 @@ OverlayDrawer {
                     visible: level > 0
                     enabled: true
                     RowLayout {
+                        height: implicitHeight + Units.smallSpacing * 2
                         anchors {
                             left: parent.left
                         }
@@ -151,9 +154,9 @@ OverlayDrawer {
                             source: "go-previous"
                         }
                         Label {
-							// Weird, this doesn't work
+                            // Weird, this doesn't work
                             //text: (typeof(i18n) != undefined) ? i18n("Back") : "Back"
-							text: "Back"
+                            text: "Back"
                         }
                     }
                     onClicked: pageRow.pop()
@@ -161,6 +164,7 @@ OverlayDrawer {
                 delegate: ListItem {
                     enabled: true
                     RowLayout {
+                        height: implicitHeight + Units.smallSpacing*2
                         anchors {
                             left: parent.left
                             right: parent.right