From 80fcd710eef489cd2c7038e53400bdc30a1f6ca1 Mon Sep 17 00:00:00 2001 From: Rick Walsh Date: Wed, 4 May 2016 07:30:56 +1000 Subject: QML DiveDetailsView only use one bottomlayout Splitting the bottomlayout in two leads to columns in the grid not lining up. It was a workaround that hopefully isn't needed any longer. Signed-off-by: Rick Walsh Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/DiveDetailsView.qml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'mobile-widgets/qml') diff --git a/mobile-widgets/qml/DiveDetailsView.qml b/mobile-widgets/qml/DiveDetailsView.qml index 6a514acea..5e9fd5beb 100644 --- a/mobile-widgets/qml/DiveDetailsView.qml +++ b/mobile-widgets/qml/DiveDetailsView.qml @@ -18,7 +18,7 @@ Item { property real col4Width: gridWidth * 0.20 width: diveDetailsPage.width - diveDetailsPage.leftPadding - diveDetailsPage.rightPadding - height: mainLayout.implicitHeight + bottomLayout.implicitHeight + bottomLayout2.implicitHeight + Kirigami.Units.iconSizes.large + height: mainLayout.implicitHeight + bottomLayout.implicitHeight + Kirigami.Units.iconSizes.large Rectangle { z: 99 color: Kirigami.Theme.textColor @@ -221,20 +221,6 @@ Item { wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere width: detailsView.col4Width } - } - // clearly, Qt 5.6.0 is buggy as having this as one GridLayout - // causes crashes - GridLayout { - id: bottomLayout2 - anchors { - top: bottomLayout.bottom - left: parent.left - right: parent.right - margins: Math.round(Kirigami.Units.gridUnit / 2) - } - columns: 4 - rowSpacing: Kirigami.Units.smallSpacing * 2 - columnSpacing: Kirigami.Units.smallSpacing Kirigami.Label { text: qsTr("Buddy:") -- cgit v1.2.3-70-g09d2