mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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>
This commit is contained in:
parent
9aa95dc233
commit
80fcd710ee
1 changed files with 1 additions and 15 deletions
|
|
@ -18,7 +18,7 @@ Item {
|
||||||
property real col4Width: gridWidth * 0.20
|
property real col4Width: gridWidth * 0.20
|
||||||
|
|
||||||
width: diveDetailsPage.width - diveDetailsPage.leftPadding - diveDetailsPage.rightPadding
|
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 {
|
Rectangle {
|
||||||
z: 99
|
z: 99
|
||||||
color: Kirigami.Theme.textColor
|
color: Kirigami.Theme.textColor
|
||||||
|
|
@ -221,20 +221,6 @@ Item {
|
||||||
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
|
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
|
||||||
width: detailsView.col4Width
|
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 {
|
Kirigami.Label {
|
||||||
text: qsTr("Buddy:")
|
text: qsTr("Buddy:")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue