[PATCH 2/2] QML DiveDetailsView only use one bottomlayout

Rick Walsh rickmwalsh at gmail.com
Tue May 3 14:30:56 PDT 2016


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 <rickmwalsh at gmail.com>
---
 mobile-widgets/qml/DiveDetailsView.qml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/mobile-widgets/qml/DiveDetailsView.qml b/mobile-widgets/qml/DiveDetailsView.qml
index 5e708d4..53ad68e 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: "Buddy:"
-- 
2.5.5



More information about the subsurface mailing list