From 78d70b0200f682d6cf7a4267aff2c2d2a7d0e276 Mon Sep 17 00:00:00 2001 From: Joakim Bygdell Date: Thu, 30 Jul 2015 10:17:22 +0200 Subject: [PATCH 2/2] QML UI: make the top bars look the same The top bars on the main page and dive details should be the dame height and keep the same layout. Signed-off-by: Joakim Bygdell --- qt-mobile/DiveDetails.qml | 20 ++++++++++++++++---- qt-mobile/main.qml | 6 ++++-- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/qt-mobile/DiveDetails.qml b/qt-mobile/DiveDetails.qml index 6f8e83b..3c5120a 100644 --- a/qt-mobile/DiveDetails.qml +++ b/qt-mobile/DiveDetails.qml @@ -35,29 +35,39 @@ Item { clip: true ColumnLayout { width: parent.width + spacing: 8 Rectangle { id: topBar color: "#2C4882" Layout.fillWidth: true Layout.margins: 0 - height: backButton.height * 1.2 + Layout.minimumHeight: prefsButton.height * 1.2 RowLayout { + anchors.bottom: topBar.bottom + anchors.bottomMargin: prefsButton.height * 0.1 + anchors.left: topBar.left + anchors.leftMargin: prefsButton.height * 0.1 + anchors.right: topBar.right + anchors.rightMargin: prefsButton.height * 0.1 Button { id: backButton - Layout.margins: 0.1 * height + Layout.maximumHeight: prefsButton.height + Layout.minimumHeight: prefsButton.height Layout.preferredWidth: Screen.width * 0.1 text: "\u2190" style: ButtonStyle { background: Rectangle { - color: "#4C68A2" + color: "#2C4882" implicitWidth: 50 } label: Text { id: txt color: "white" - font.pointSize: 24 + font.pointSize: 18 font.bold: true text: control.text + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter } } onClicked: { @@ -76,6 +86,8 @@ Item { font.pointSize: 18 font.bold: true color: "white" + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: Text.AlignHCenter } } } diff --git a/qt-mobile/main.qml b/qt-mobile/main.qml index 2cd1e5f..24ebb40 100644 --- a/qt-mobile/main.qml +++ b/qt-mobile/main.qml @@ -60,7 +60,7 @@ ApplicationWindow { ColumnLayout { id: awLayout anchors.fill: parent - spacing: prefsButton.height * 0.1 + spacing: 8 Rectangle { id: topPart color: "#2C4882" @@ -68,7 +68,7 @@ ApplicationWindow { Layout.fillWidth: true anchors.bottom: detailsPage.top anchors.bottomMargin: prefsButton.height * 0.1 - + Layout.margins: 0 RowLayout { anchors.bottom: topPart.bottom anchors.bottomMargin: prefsButton.height * 0.1 @@ -81,6 +81,8 @@ ApplicationWindow { font.pointSize: 18 font.bold: true color: "white" + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: Text.AlignHCenter } Button { id: prefsButton -- 2.3.2 (Apple Git-55)