diff options
author | Rick Walsh <rickmwalsh@gmail.com> | 2016-05-04 07:30:56 +1000 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2016-05-03 15:22:23 -0700 |
commit | 80fcd710eef489cd2c7038e53400bdc30a1f6ca1 (patch) | |
tree | c2ae0e7fc618c12e8986c1762fac7f3f01d0255b /mobile-widgets | |
parent | 9aa95dc233d91bf2f10ea1cf79dec0ff13379c2d (diff) | |
download | subsurface-80fcd710eef489cd2c7038e53400bdc30a1f6ca1.tar.gz |
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 <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets')
-rw-r--r-- | mobile-widgets/qml/DiveDetailsView.qml | 16 |
1 files changed, 1 insertions, 15 deletions
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:") |