summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2016-05-01 11:20:33 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-05-01 11:22:09 -0700
commit744e59688342ecdbbbadf1f2275b31d074647d7b (patch)
tree04b590848de015a271d1d3dc320440ba130aa10c
parent22e225fc77105c32abf780c779e3a4fe12f79a6d (diff)
downloadsubsurface-744e59688342ecdbbbadf1f2275b31d074647d7b.tar.gz
QML UI: break grid layout into smaller layouts
Since the big layout causes an infinite recursion in the Qt/QML layout engine. Also remove a no longer accurate comment. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--mobile-widgets/qml/DiveDetailsView.qml15
1 files changed, 14 insertions, 1 deletions
diff --git a/mobile-widgets/qml/DiveDetailsView.qml b/mobile-widgets/qml/DiveDetailsView.qml
index 9ad229e20..f7b2980cc 100644
--- a/mobile-widgets/qml/DiveDetailsView.qml
+++ b/mobile-widgets/qml/DiveDetailsView.qml
@@ -140,7 +140,6 @@ Item {
Layout.columnSpan: 4
}
- // first row - here we set up the column widths - total is 90% of width
Kirigami.Label {
text: "Suit:"
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
@@ -236,6 +235,20 @@ Item {
Layout.maximumWidth: detailsView.col4Width
Layout.preferredWidth: 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:"