diff options
| author | Juho Annunen <juho.annunen@qt.io> | 2018-08-20 12:25:40 +0300 |
|---|---|---|
| committer | Juho Annunen <juho.annunen@qt.io> | 2018-08-29 07:30:00 +0000 |
| commit | 09aa32dd522176a9b9762e4d85b3e8c66d4d6be2 (patch) | |
| tree | 06600dddeb2598e2745f21d52aad73b4ea456990 /basicsuite/ebike-ui/GeneralTab.qml | |
| parent | 1ff81b46a37550bb4430cc032b6d5504525af53f (diff) | |
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>
Diffstat (limited to 'basicsuite/ebike-ui/GeneralTab.qml')
| -rw-r--r-- | basicsuite/ebike-ui/GeneralTab.qml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/basicsuite/ebike-ui/GeneralTab.qml b/basicsuite/ebike-ui/GeneralTab.qml index 697a451..70f661f 100644 --- a/basicsuite/ebike-ui/GeneralTab.qml +++ b/basicsuite/ebike-ui/GeneralTab.qml @@ -47,13 +47,13 @@ Item { anchors.right: parent.right Text { - height: UILayout.configurationItemHeight + height: stackLayout.height * 0.225 width: parent.width text: qsTr("GENERAL") font { family: "Montserrat, Medium" weight: Font.Medium - pixelSize: UILayout.configurationTitleSize + pixelSize: height * 0.375 } color: Colors.tabTitleColor verticalAlignment: Text.AlignVCenter @@ -76,7 +76,7 @@ Item { font { family: "Montserrat, Medium" weight: Font.Medium - pixelSize: UILayout.languageTextSize + pixelSize: height * 0.25 } color: Colors.languageTextColor verticalAlignment: Text.AlignVCenter @@ -100,7 +100,7 @@ Item { font { family: "Montserrat, Medium" weight: Font.Medium - pixelSize: UILayout.checkboxLabelSize + pixelSize: parent.height * 0.225 } color: Colors.checkboxCheckedText } @@ -139,6 +139,7 @@ Item { Slider { id: brightnessSlider value: 4 + width: parent.width * 0.2 anchors { top: parent.top bottom: parent.bottom @@ -202,8 +203,8 @@ Item { RoundButton { id: kmhButton - width: UILayout.unitButtonWidthMargin * 2 + kmhText.implicitWidth - height: UILayout.unitButtonHeight + height: parent.height * 0.6 + width: height + kmhText.implicitWidth radius: height / 2 anchors { verticalCenter: parent.verticalCenter @@ -237,8 +238,8 @@ Item { RoundButton { id: mphButton - width: UILayout.unitButtonWidthMargin * 2 + mphText.implicitWidth - height: UILayout.unitButtonHeight + height: parent.height * 0.6 + width: height + mphText.implicitWidth radius: height / 2 anchors { verticalCenter: parent.verticalCenter |