mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync with mobilecomponents e7d789465b9a935ec

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

Signed-off-by: Sebastian Kügler <sebas@kde.org>
This commit is contained in:
Sebastian Kügler 2015-11-30 01:17:41 +01:00
parent 52b3c68b24
commit 09bf7fabcf
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qt-mobile/qml/mobilecomponents/ContextDrawer.qml
View file

@ -18,6 +18,7 @@
*/ */
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Layouts 1.2
import QtQuick.Controls 1.0 as QtControls import QtQuick.Controls 1.0 as QtControls
import org.kde.plasma.mobilecomponents 0.2 import org.kde.plasma.mobilecomponents 0.2
@ -63,7 +64,8 @@ OverlayDrawer {
} }
delegate: ListItem { delegate: ListItem {
enabled: true enabled: true
Row { RowLayout {
height: implicitHeight + Units.smallSpacing * 2
anchors { anchors {
left: parent.left left: parent.left
margins: Units.largeSpacing margins: Units.largeSpacing

8
qt-mobile/qml/mobilecomponents/GlobalDrawer.qml
View file

@ -49,6 +49,7 @@ OverlayDrawer {
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 fillMode: Image.PreserveAspectCrop
asynchronous: true
anchors { anchors {
left: parent.left left: parent.left
@ -123,6 +124,7 @@ OverlayDrawer {
Layout.maximumWidth: Layout.minimumWidth Layout.maximumWidth: Layout.minimumWidth
Layout.fillWidth: false Layout.fillWidth: false
Layout.fillHeight: true Layout.fillHeight: true
visible: children.length > 0
} }
Item { Item {
Layout.minimumWidth: Units.smallSpacing Layout.minimumWidth: Units.smallSpacing
@ -142,6 +144,7 @@ OverlayDrawer {
visible: level > 0 visible: level > 0
enabled: true enabled: true
RowLayout { RowLayout {
height: implicitHeight + Units.smallSpacing * 2
anchors { anchors {
left: parent.left left: parent.left
} }
@ -151,9 +154,9 @@ OverlayDrawer {
source: "go-previous" source: "go-previous"
} }
Label { Label {
// Weird, this doesn't work // Weird, this doesn't work
//text: (typeof(i18n) != undefined) ? i18n("Back") : "Back" //text: (typeof(i18n) != undefined) ? i18n("Back") : "Back"
text: "Back" text: "Back"
} }
} }
onClicked: pageRow.pop() onClicked: pageRow.pop()
@ -161,6 +164,7 @@ OverlayDrawer {
delegate: ListItem { delegate: ListItem {
enabled: true enabled: true
RowLayout { RowLayout {
height: implicitHeight + Units.smallSpacing*2
anchors { anchors {
left: parent.left left: parent.left
right: parent.right right: parent.right