diff options
Diffstat (limited to 'qt-mobile')
| -rw-r--r-- | qt-mobile/qml/DiveDetails.qml | 1 | ||||
| -rw-r--r-- | qt-mobile/qml/DiveDetailsEdit.qml | 3 | ||||
| -rw-r--r-- | qt-mobile/qml/main.qml | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/qt-mobile/qml/DiveDetails.qml b/qt-mobile/qml/DiveDetails.qml index 2b530b660..7aabdfdbf 100644 --- a/qt-mobile/qml/DiveDetails.qml +++ b/qt-mobile/qml/DiveDetails.qml @@ -60,7 +60,6 @@ MobileComponents.Page { detailsEdit.buddyText = diveDetailsListView.currentItem.modelData.dive.buddy detailsEdit.divemasterText = diveDetailsListView.currentItem.modelData.dive.divemaster detailsEdit.notesText = diveDetailsListView.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 1c6c4a0f5..0ae674681 100644 --- a/qt-mobile/qml/DiveDetailsEdit.qml +++ b/qt-mobile/qml/DiveDetailsEdit.qml @@ -22,13 +22,12 @@ Item { property alias durationText: txtDuration.text property alias depthText: txtDepth.text property alias weightText: txtWeight.text - property int forcedWidth height: editArea.height ColumnLayout { id: editArea spacing: MobileComponents.Units.smallSpacing - width: forcedWidth + width: subsurfaceTheme.columnWidth - 2 * MobileComponents.Units.gridUnit GridLayout { id: editorDetails diff --git a/qt-mobile/qml/main.qml b/qt-mobile/qml/main.qml index 3b81c615e..9c4a36c43 100644 --- a/qt-mobile/qml/main.qml +++ b/qt-mobile/qml/main.qml @@ -209,6 +209,7 @@ MobileComponents.ApplicationWindow { property color accentColor: "#2d5b9a" property color shadedColor: "#132744" property color accentTextColor: "#ececec" + property int columnWidth: Math.round(rootItem.width/(MobileComponents.Units.gridUnit*30)) > 0 ? Math.round(rootItem.width / Math.round(rootItem.width/(MobileComponents.Units.gridUnit*30))) : rootItem.width } toolBar: TopBar { |