From b6f5f235f0ab3c84e960f2cf46e542592195abbf Mon Sep 17 00:00:00 2001 From: Sebastian Kügler Date: Fri, 4 Dec 2015 00:27:35 +0100 Subject: sync with mobilecomponents 9d8bf6d77d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixes interactivity in context drawer. - These are mostly cleanups that have been done pre-merge of these components. This now is the state of master in plasma-mobile. - makes navigation a bit more intuitive Signed-off-by: Sebastian Kügler --- qt-mobile/qml/mobilecomponents/GlobalDrawer.qml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'qt-mobile/qml/mobilecomponents/GlobalDrawer.qml') diff --git a/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml b/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml index 638222ada..1632da122 100644 --- a/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml +++ b/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml @@ -46,7 +46,7 @@ OverlayDrawer { Layout.preferredWidth: title.implicitWidth Layout.preferredHeight: bannerImageSource != "" ? Math.max(title.implicitHeight, Math.floor(width / (sourceSize.width/sourceSize.height))) : title.implicitHeight - Layout.minimumHeight: Math.max(headingIcon.height, heading.height) + Units.smallSpacing*2 + Layout.minimumHeight: Math.max(headingIcon.height, heading.height) + Units.smallSpacing * 2 fillMode: Image.PreserveAspectCrop asynchronous: true @@ -97,8 +97,8 @@ OverlayDrawer { color: bannerImageSource != "" ? "white" : Theme.textColor } Item { - height: parent.height - Layout.minimumWidth: height + height: 1 + Layout.minimumWidth: heading.height } } } @@ -157,9 +157,7 @@ OverlayDrawer { source: "go-previous" } Label { - // Weird, this doesn't work - //text: (typeof(i18n) != undefined) ? i18n("Back") : "Back" - text: "Back" + text: typeof i18n !== "undefined" ? i18n("Back") : "Back" } } onClicked: pageRow.pop() @@ -167,7 +165,7 @@ OverlayDrawer { delegate: ListItem { enabled: true RowLayout { - height: implicitHeight + Units.smallSpacing*2 + height: implicitHeight + Units.smallSpacing * 2 anchors { left: parent.left right: parent.right -- cgit v1.2.3-70-g09d2