From 09aa32dd522176a9b9762e4d85b3e8c66d4d6be2 Mon Sep 17 00:00:00 2001
From: Juho Annunen <juho.annunen@qt.io>
Date: Mon, 20 Aug 2018 12:25:40 +0300
Subject: Fix some major scaling & font issues on ebike-demo

Task-number: QTBUG-69840
Change-Id: If519ae62a0a73c8dbf2f6f7b9f681bdfdb8b28a0
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 basicsuite/ebike-ui/NaviBox.qml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'basicsuite/ebike-ui/NaviBox.qml')

diff --git a/basicsuite/ebike-ui/NaviBox.qml b/basicsuite/ebike-ui/NaviBox.qml
index 53b55c8..9a97cf8 100644
--- a/basicsuite/ebike-ui/NaviBox.qml
+++ b/basicsuite/ebike-ui/NaviBox.qml
@@ -41,22 +41,23 @@ import "./BikeStyle"
 
 // Top-right corner, navi
 Item {
-    width: 320
-    height: UILayout.topViewHeight
+    id: rootItem
+    width: root.width * 0.425
+    height: root.height * 0.45
     property string arrowSource: "images/nav_right.png"
     property string distance: "0"
     property string unit: "m"
 
+    property real imageMargin: Math.min(width, height) * 0.275
     Image {
         id: naviIcon
-        width: UILayout.naviIconWidth
-        height: UILayout.naviIconHeight
+        width: Math.min(parent.width, parent.height) * 0.375
+        height: width
         source: arrowSource
         anchors {
             top: parent.top
-            topMargin: UILayout.naviIconTop
-            horizontalCenter: parent.right
-            horizontalCenterOffset: -UILayout.naviModeCenterMargin
+            topMargin: imageMargin
+            left: parent.horizontalCenter
         }
     }
 
@@ -75,7 +76,7 @@ Item {
             font {
                 family: "Montserrat, Bold"
                 weight: Font.Bold
-                pixelSize: UILayout.naviTextSize
+                pixelSize: rootItem.height * 0.1
             }
             text: Math.round(datastore.convertSmallDistance(distance) / 10) * 10
         }
@@ -91,7 +92,7 @@ Item {
             font {
                 family: "Montserrat, Light"
                 weight: Font.Light
-                pixelSize: UILayout.naviTextSize
+                pixelSize: rootItem.height * 0.1
             }
             text: datastore.smallUnit
         }
@@ -106,13 +107,13 @@ Item {
         font {
             family: "Montserrat, Medium"
             weight: Font.Medium
-            pixelSize: UILayout.modeTextSize
+            pixelSize: rootItem.height * 0.1
         }
         text: qsTr("NAVIGATE")
     }
 
     Rectangle {
-        width: UILayout.horizontalViewSeparatorWidth
+        width: parent.width * 0.775
         height: UILayout.horizontalViewSeparatorHeight
         anchors.bottom: parent.bottom
         anchors.right: parent.right
@@ -121,7 +122,7 @@ Item {
 
     Rectangle {
         width: UILayout.verticalViewSeparatorWidth
-        height: UILayout.verticalViewSeparatorHeightTop
+        height: parent.height * 0.475
         anchors.top: parent.top
         anchors.left: parent.left
         color: Colors.separator
-- 
cgit v1.2.3