summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2016-01-21 13:09:10 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-01-21 13:09:10 -0800
commit260cd14a2b7331e8b6a607058b43ea26f32667a5 (patch)
tree2498545712eeea786e6421c4ac9f6e0f7aa4722f
parent9e9d220c98038aa8a6864b7544544b09cfadefd2 (diff)
downloadsubsurface-260cd14a2b7331e8b6a607058b43ea26f32667a5.tar.gz
QML UI: maximize horizontal size of notes when editing
This seems a bit brute force but I couldn't get the width to propagate correctly any other way. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-mobile/qml/DiveDetails.qml1
-rw-r--r--qt-mobile/qml/DiveDetailsEdit.qml8
2 files changed, 7 insertions, 2 deletions
diff --git a/qt-mobile/qml/DiveDetails.qml b/qt-mobile/qml/DiveDetails.qml
index 4d5b89aa0..1808bc5c5 100644
--- a/qt-mobile/qml/DiveDetails.qml
+++ b/qt-mobile/qml/DiveDetails.qml
@@ -47,6 +47,7 @@ MobileComponents.Page {
detailsEdit.buddyText = diveListView.currentItem.modelData.dive.buddy
detailsEdit.divemasterText = diveListView.currentItem.modelData.dive.divemaster
detailsEdit.notesText = diveListView.currentItem.modelData.dive.notes
+ detailsEdit.forcedWidth = diveDetailsPage.width
diveDetailsPage.state = "edit"
}
}
diff --git a/qt-mobile/qml/DiveDetailsEdit.qml b/qt-mobile/qml/DiveDetailsEdit.qml
index 7211639c1..14366fec4 100644
--- a/qt-mobile/qml/DiveDetailsEdit.qml
+++ b/qt-mobile/qml/DiveDetailsEdit.qml
@@ -21,11 +21,12 @@ Item {
property alias notesText: txtNotes.text
property alias durationText: txtDuration.text
property alias depthText: txtDepth.text
+ property int forcedWidth
height: editArea.height
ColumnLayout {
id: editArea
spacing: MobileComponents.Units.smallSpacing
-
+ width: forcedWidth
GridLayout {
id: editorDetails
@@ -132,10 +133,13 @@ Item {
}
MobileComponents.Label {
- Layout.alignment: Qt.AlignRight
+ Layout.columnSpan: 2
+ Layout.alignment: Qt.AlignLeft
text: "Notes:"
}
TextArea {
+ Layout.columnSpan: 2
+ width: parent.width
id: txtNotes
textFormat: TextEdit.RichText
focus: true