From 3413dfc3aa98638f135e5e49e8b9357f63d20fed Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 13 Feb 2016 23:44:59 -0800 Subject: QML UI: simplify and correct top bar layout Now things are centered and reasonably well spaced Signed-off-by: Dirk Hohndel --- qt-mobile/qml/TopBar.qml | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'qt-mobile/qml/TopBar.qml') diff --git a/qt-mobile/qml/TopBar.qml b/qt-mobile/qml/TopBar.qml index c251687e6..ed6f41182 100644 --- a/qt-mobile/qml/TopBar.qml +++ b/qt-mobile/qml/TopBar.qml @@ -11,44 +11,35 @@ import org.subsurfacedivelog.mobile 1.0 Rectangle { id: topPart - property bool goBack: (stackView.depth > 1) - property double topMenuShrink: 0.6 - color: subsurfaceTheme.accentColor - Layout.minimumHeight: Math.round(MobileComponents.Units.gridUnit * 2.5 * topMenuShrink) + Layout.minimumHeight: Math.round(MobileComponents.Units.gridUnit * 1.5) Layout.fillWidth: true Layout.margins: 0 RowLayout { - anchors.bottom: topPart.bottom - anchors.bottomMargin: MobileComponents.Units.smallSpacing - anchors.left: topPart.left - anchors.leftMargin: MobileComponents.Units.smallSpacing - anchors.right: topPart.right - anchors.rightMargin: MobileComponents.Units.smallSpacing + anchors.verticalCenter: topPart.verticalCenter Item { Layout.preferredHeight: subsurfaceLogo.height + Layout.leftMargin: MobileComponents.Units.gridUnit / 4 Image { id: subsurfaceLogo source: "qrc:/qml/subsurface-mobile-icon.png" anchors { - top: parent.top - topMargin: MobileComponents.Units.smallSpacing * -1 + verticalCenter: parent.Center left: parent.left } - width: Math.round(MobileComponents.Units.gridUnit * 1.7 * topMenuShrink) + width: Math.round(MobileComponents.Units.gridUnit) height: width } MobileComponents.Label { text: qsTr("Subsurface-mobile") - font.pointSize: Math.round(MobileComponents.Theme.defaultFont.pointSize * 1.3 * topMenuShrink) - height: subsurfaceLogo.height * 2 * topMenuShrink + font.pointSize: Math.round(MobileComponents.Theme.defaultFont.pointSize) + height: subsurfaceLogo.height anchors { left: subsurfaceLogo.right - bottom: subsurfaceLogo.bottom leftMargin: Math.round(MobileComponents.Units.gridUnit / 2) } font.weight: Font.Light - verticalAlignment: Text.AlignBottom + verticalAlignment: Text.AlignVCenter Layout.fillWidth: false color: subsurfaceTheme.accentTextColor } -- cgit v1.2.3-70-g09d2