From 15a014105bc0a79552620965ac888858cdecd29a Mon Sep 17 00:00:00 2001 From: Rick Walsh Date: Wed, 20 Jan 2016 06:44:08 +1100 Subject: QML UI: Don't explicitly set width of GridLayout items It is not recommended to set the width explicitly of items in a layout. This caused some issues in DiveDetailsView, which were fixed by commit 1030cb2. See http://doc.qt.io/qt-5/qml-qtquick-layouts-layout.html#details Set 'Layout.preferredWidth' instead of 'width' for GpsList and Preferences Signed-off-by: Rick Walsh Signed-off-by: Dirk Hohndel --- qt-mobile/qml/GpsList.qml | 4 ++-- qt-mobile/qml/Preferences.qml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'qt-mobile/qml') diff --git a/qt-mobile/qml/GpsList.qml b/qt-mobile/qml/GpsList.qml index 8e9349c3c..422775e3d 100644 --- a/qt-mobile/qml/GpsList.qml +++ b/qt-mobile/qml/GpsList.qml @@ -53,7 +53,7 @@ MobileComponents.Page { } MobileComponents.Label { text: date - width: Math.max(parent.width / 5, paintedWidth) // helps vertical alignment throughout listview + Layout.preferredWidth: Math.max(parent.width / 5, paintedWidth) font.pointSize: subsurfaceTheme.smallPointSize } MobileComponents.Label { @@ -63,7 +63,7 @@ MobileComponents.Page { } MobileComponents.Label { text: name - width: Math.max(parent.width / 5, paintedWidth) // helps vertical alignment throughout listview + Layout.preferredWidth: Math.max(parent.width / 5, paintedWidth) font.pointSize: subsurfaceTheme.smallPointSize } MobileComponents.Label { diff --git a/qt-mobile/qml/Preferences.qml b/qt-mobile/qml/Preferences.qml index 8ce739e4a..1644b5949 100644 --- a/qt-mobile/qml/Preferences.qml +++ b/qt-mobile/qml/Preferences.qml @@ -57,7 +57,7 @@ GridLayout { Item { width: MobileComponents.Units.gridUnit; height: width } Item { height: saveButton.height - width: saveButton.width + Layout.preferredWidth: saveButton.width Button { id: saveButton text: "Save" -- cgit v1.2.3-70-g09d2