From a5e5b43bbedf11fea87a96d4d1635b94e08a6446 Mon Sep 17 00:00:00 2001
From: Maurice Kalinowski <maurice.kalinowski@qt.io>
Date: Mon, 25 Sep 2017 14:19:49 +0200
Subject: iot-sensortag: Align font sizes

26 is used on some, but not all locations. That had the side effect,
that text had different sizes on different platforms causing layouting
issues.

Change-Id: I057010fdf2aa562c188bd2376829d065a5eeff93
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 tradeshow/iot-sensortag/resources/base/AccelChart.qml             | 1 +
 tradeshow/iot-sensortag/resources/base/AltitudeChart.qml          | 1 +
 tradeshow/iot-sensortag/resources/base/GyroChart.qml              | 2 ++
 tradeshow/iot-sensortag/resources/base/HumidityChart.qml          | 2 ++
 tradeshow/iot-sensortag/resources/base/MagnetometerChart.qml      | 2 ++
 tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml | 2 ++
 tradeshow/iot-sensortag/resources/base/TemperatureChart.qml       | 3 +++
 7 files changed, 13 insertions(+)

diff --git a/tradeshow/iot-sensortag/resources/base/AccelChart.qml b/tradeshow/iot-sensortag/resources/base/AccelChart.qml
index 10a7758..d037ff1 100644
--- a/tradeshow/iot-sensortag/resources/base/AccelChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/AccelChart.qml
@@ -90,6 +90,7 @@ BaseChart {
                             anchors.centerIn: parent
                             text: (index == 0) ? acceXValue : ((index == 1) ? acceYValue : acceZValue)
                             color: "white"
+                            font.pixelSize: 26
                         }
                     }
 
diff --git a/tradeshow/iot-sensortag/resources/base/AltitudeChart.qml b/tradeshow/iot-sensortag/resources/base/AltitudeChart.qml
index 2c05bc7..20a8a0e 100644
--- a/tradeshow/iot-sensortag/resources/base/AltitudeChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/AltitudeChart.qml
@@ -152,6 +152,7 @@ BaseChart {
                 anchors.centerIn: parent
                 anchors.horizontalCenterOffset: 74
                 color: "white"
+                font.pixelSize: 26
             }
         }
     }
diff --git a/tradeshow/iot-sensortag/resources/base/GyroChart.qml b/tradeshow/iot-sensortag/resources/base/GyroChart.qml
index 63a9122..f09ef6b 100644
--- a/tradeshow/iot-sensortag/resources/base/GyroChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/GyroChart.qml
@@ -159,6 +159,7 @@ BaseChart {
                         color: "white"
                         anchors.left: parent.left
                         anchors.bottom: parent.bottom
+                        font.pixelSize: 26
                     }
 
                     Text {
@@ -170,6 +171,7 @@ BaseChart {
                         anchors.left: coordText.right
                         anchors.leftMargin: 16
                         anchors.bottom: parent.bottom
+                        font.pixelSize: 26
                     }
                 }
             }
diff --git a/tradeshow/iot-sensortag/resources/base/HumidityChart.qml b/tradeshow/iot-sensortag/resources/base/HumidityChart.qml
index 582128f..869288a 100644
--- a/tradeshow/iot-sensortag/resources/base/HumidityChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/HumidityChart.qml
@@ -102,6 +102,7 @@ BaseChart {
             text: "Max\n" + maxHumi.toFixed(0) + " %"
             lineHeight: 0.8
             color: "white"
+            font.pixelSize: 26
         }
 
         Text {
@@ -111,6 +112,7 @@ BaseChart {
             text: "Min\n" + minHumi.toFixed(0) + " %"
             lineHeight: 0.8
             color: "white"
+            font.pixelSize: 26
         }
     }
 }
diff --git a/tradeshow/iot-sensortag/resources/base/MagnetometerChart.qml b/tradeshow/iot-sensortag/resources/base/MagnetometerChart.qml
index 6f0d3c7..2b2ccac 100644
--- a/tradeshow/iot-sensortag/resources/base/MagnetometerChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/MagnetometerChart.qml
@@ -153,6 +153,7 @@ BaseChart {
                         color: (index == 0) ? xColor : ((index == 1) ? yColor : zColor)
                         anchors.left: parent.left
                         anchors.bottom: parent.bottom
+                        font.pixelSize: 26
                     }
 
                     Text {
@@ -164,6 +165,7 @@ BaseChart {
                         anchors.left: coordText.right
                         anchors.leftMargin: 16
                         anchors.bottom: parent.bottom
+                        font.pixelSize: 26
                     }
                 }
             }
diff --git a/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml b/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml
index ffba32b..a594257 100644
--- a/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml
@@ -89,6 +89,7 @@ BaseChart {
             anchors.centerIn: gauge
             anchors.horizontalCenterOffset: -120
             anchors.verticalCenterOffset: 60
+            font.pixelSize: 26
         }
 
         Text {
@@ -107,6 +108,7 @@ BaseChart {
             anchors.centerIn: gauge
             anchors.horizontalCenterOffset: 120
             anchors.verticalCenterOffset: -30
+            font.pixelSize: 26
         }
     }
 }
diff --git a/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml b/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml
index dbad24b..7a90dea 100644
--- a/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml
@@ -106,6 +106,7 @@ BaseChart {
                 anchors.horizontalCenter: reading.horizontalCenter
                 anchors.top: parent.top
                 color: "white"
+                font.pixelSize: 26
             }
 
             Image {
@@ -132,6 +133,7 @@ BaseChart {
                 color: "white"
                 anchors.bottom: parent.bottom
                 anchors.horizontalCenter: reading.horizontalCenter
+                font.pixelSize: 26
             }
 
             Text {
@@ -143,6 +145,7 @@ BaseChart {
                 color: "white"
                 anchors.right: parent.right
                 anchors.verticalCenter: reading.verticalCenter
+                font.pixelSize: 26
             }
         }
 
-- 
cgit v1.2.3