summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2017-03-17 09:44:14 +0200
committerKatja Marttila <katja.marttila@qt.io>2017-03-20 05:51:42 +0000
commitda09bf565f46032dad5bb024afd5103cf7822f28 (patch)
tree2f50f767f840d336328d2414f0f4f6155b2608c3
parent77ecd7d03aeea3bb7d10ac8ef448920da11ae306 (diff)
Fix time and image misplacing
Change-Id: I207a8216fbe0af7619079ac0130f6423982c8a5b Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--CenterConsole/sysui/CenterItems/MapPage.qml3
-rw-r--r--CenterConsole/sysui/StatusBar/DateAndTime.qml5
2 files changed, 5 insertions, 3 deletions
diff --git a/CenterConsole/sysui/CenterItems/MapPage.qml b/CenterConsole/sysui/CenterItems/MapPage.qml
index d87b13d..422e634 100644
--- a/CenterConsole/sysui/CenterItems/MapPage.qml
+++ b/CenterConsole/sysui/CenterItems/MapPage.qml
@@ -53,6 +53,7 @@ Item {
}
Image {
+ id: qtLogo
z: 3
source: Style.symbol("Built_with_Qt_RGB_logo_white")
anchors.right: parent.right
@@ -276,7 +277,7 @@ Item {
visible: map.mapManuallyMoved
source: Style.symbol("CarFocusButton")
anchors.right: parent.right
- anchors.top: root.top
+ anchors.top: qtLogo.bottom
anchors.margins: 20
MouseArea {
id: area
diff --git a/CenterConsole/sysui/StatusBar/DateAndTime.qml b/CenterConsole/sysui/StatusBar/DateAndTime.qml
index 47039d2..7c49e33 100644
--- a/CenterConsole/sysui/StatusBar/DateAndTime.qml
+++ b/CenterConsole/sysui/StatusBar/DateAndTime.qml
@@ -59,6 +59,7 @@ UIElement {
Label {
id: clock
font.capitalization: Font.AllUppercase
- text: Qt.formatDateTime(new Date(), "hh:mm")
- } }
+ text: ValueSource.time
+ }
+ }
}