mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 22:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: make the top bars look the same

Browse source 
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 <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Joakim Bygdell 2015-07-30 10:17:22 +02:00 • committed by Dirk Hohndel
parent 10e531d907
commit 59a18ab000
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
qt-mobile/DiveDetails.qml
View file

@ -35,29 +35,46 @@ Item {
clip: true clip: true
ColumnLayout { ColumnLayout {
width: parent.width width: parent.width
spacing: 8
Rectangle { Rectangle {
id: topBar id: topBar
color: "#2C4882" color: "#2C4882"
Layout.fillWidth: true Layout.fillWidth: true
Layout.margins: 0 Layout.margins: 0
height: backButton.height * 1.2 Layout.minimumHeight: prefsButton.height * 1.2
RowLayout { 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
Text {
text: qsTr("Subsurface mobile")
font.pointSize: 18
font.bold: true
color: "white"
}
Button { Button {
id: backButton id: backButton
Layout.margins: 0.1 * height Layout.maximumHeight: prefsButton.height
Layout.minimumHeight: prefsButton.height
Layout.preferredWidth: Screen.width * 0.1 Layout.preferredWidth: Screen.width * 0.1
anchors.right: parent.right
text: "\u2190" text: "\u2190"
style: ButtonStyle { style: ButtonStyle {
background: Rectangle { background: Rectangle {
color: "#4C68A2" color: "#2C4882"
implicitWidth: 50 implicitWidth: 50
} }
label: Text { label: Text {
id: txt id: txt
color: "white" color: "white"
font.pointSize: 24 font.pointSize: 18
font.bold: true font.bold: true
text: control.text text: control.text
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
} }
} }
onClicked: { onClicked: {
@ -71,12 +88,6 @@ Item {
stackView.pop(); stackView.pop();
} }
} }
Text {
text: qsTr("Subsurface mobile")
font.pointSize: 18
font.bold: true
color: "white"
}
} }
} }
GridLayout { GridLayout {

4
qt-mobile/main.qml
View file

@ -60,7 +60,7 @@ ApplicationWindow {
ColumnLayout { ColumnLayout {
id: awLayout id: awLayout
anchors.fill: parent anchors.fill: parent
spacing: prefsButton.height * 0.1 spacing: 8
Rectangle { Rectangle {
id: topPart id: topPart
color: "#2C4882" color: "#2C4882"
@ -68,7 +68,7 @@ ApplicationWindow {
Layout.fillWidth: true Layout.fillWidth: true
anchors.bottom: detailsPage.top anchors.bottom: detailsPage.top
anchors.bottomMargin: prefsButton.height * 0.1 anchors.bottomMargin: prefsButton.height * 0.1
Layout.margins: 0
RowLayout { RowLayout {
anchors.bottom: topPart.bottom anchors.bottom: topPart.bottom
anchors.bottomMargin: prefsButton.height * 0.1 anchors.bottomMargin: prefsButton.height * 0.1