mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 01:53:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: better way to determine dive details edit width

Browse source 
Instead of passing magic values around, calculate the columnWidth as part
of the SubsurfaceTheme object.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-01-28 22:49:46 -08:00
parent 66b08f53f2
commit ba4bb56701
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
qt-mobile/qml/DiveDetails.qml
View file

@ -60,7 +60,6 @@ MobileComponents.Page {
detailsEdit.buddyText = diveDetailsListView.currentItem.modelData.dive.buddy detailsEdit.buddyText = diveDetailsListView.currentItem.modelData.dive.buddy
detailsEdit.divemasterText = diveDetailsListView.currentItem.modelData.dive.divemaster detailsEdit.divemasterText = diveDetailsListView.currentItem.modelData.dive.divemaster
detailsEdit.notesText = diveDetailsListView.currentItem.modelData.dive.notes detailsEdit.notesText = diveDetailsListView.currentItem.modelData.dive.notes
detailsEdit.forcedWidth = diveDetailsPage.width
diveDetailsPage.state = "edit" diveDetailsPage.state = "edit"
} }
} }

3
qt-mobile/qml/DiveDetailsEdit.qml
View file

@ -22,13 +22,12 @@ Item {
property alias durationText: txtDuration.text property alias durationText: txtDuration.text
property alias depthText: txtDepth.text property alias depthText: txtDepth.text
property alias weightText: txtWeight.text property alias weightText: txtWeight.text
property int forcedWidth
height: editArea.height height: editArea.height
ColumnLayout { ColumnLayout {
id: editArea id: editArea
spacing: MobileComponents.Units.smallSpacing spacing: MobileComponents.Units.smallSpacing
width: forcedWidth width: subsurfaceTheme.columnWidth - 2 * MobileComponents.Units.gridUnit
GridLayout { GridLayout {
id: editorDetails id: editorDetails

1
qt-mobile/qml/main.qml
View file

@ -209,6 +209,7 @@ MobileComponents.ApplicationWindow {
property color accentColor: "#2d5b9a" property color accentColor: "#2d5b9a"
property color shadedColor: "#132744" property color shadedColor: "#132744"
property color accentTextColor: "#ececec" 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 { toolBar: TopBar {