From cba50ece33e348ed3be5cac3668cfc2bbd30bfdd Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sun, 31 Jan 2016 11:27:01 -0800
Subject: Revert "QML UI DiveDetailsView: shift dive number to right of top
 row"

This reverts commit 1030cb265a46436a1903cdf66d88a7dd3351d3aa.

Simply trying to find out if this is the cause for the odd crashes one
tester is seeing.
---
 qt-mobile/qml/DiveDetailsView.qml | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/qt-mobile/qml/DiveDetailsView.qml b/qt-mobile/qml/DiveDetailsView.qml
index d72f0e5a9..97d910862 100644
--- a/qt-mobile/qml/DiveDetailsView.qml
+++ b/qt-mobile/qml/DiveDetailsView.qml
@@ -72,13 +72,8 @@ Item {
 		}
 		MobileComponents.Label {
 			text: dive.date + " " + dive.time
-			Layout.columnSpan: 2
-		}
-		MobileComponents.Label {
-			id: numberText
-			Layout.alignment: Qt.AlignRight
-			text: "#" + dive.number
-			color: MobileComponents.Theme.textColor
+			Layout.minimumWidth: Math.max(MobileComponents.Units.gridUnit * 4, paintedWidth) // helps vertical alignment throughout listview
+			Layout.columnSpan: 3
 		}
 
 		MobileComponents.Label {
@@ -89,14 +84,26 @@ Item {
 		}
 		MobileComponents.Label {
 			text: dive.depth
+			Layout.minimumWidth: Math.max(MobileComponents.Units.gridUnit * 4, paintedWidth) // helps vertical alignment throughout listview
 		}
 		MobileComponents.Label {
 			Layout.alignment: Qt.AlignRight
 			text: "Duration: "
 			opacity: 0.6
 		}
-		MobileComponents.Label {
-			text: dive.duration
+		RowLayout {
+			MobileComponents.Label {
+				text: dive.duration
+			}
+			Item {
+				Layout.fillWidth: true
+				height: parent.height
+			}
+			MobileComponents.Label {
+				id: numberText
+				text: "#" + dive.number
+				color: MobileComponents.Theme.textColor
+			}
 		}
 
 		QMLProfile {
-- 
cgit v1.2.3-70-g09d2