diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-14 10:25:01 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-14 10:27:21 +0300 |
| commit | 97863a4992276a3d1aeb3c1bb9ef5a280a5e8b12 (patch) | |
| tree | b38f6f152e7036b91c25834a917e320955660db2 /basicsuite/ebike-ui/GeneralTab.qml | |
| parent | 8be609623fc646e8d9642fc8481a1b9e59fb8417 (diff) | |
| parent | aa8e21cc3f60e54dd9c5d1ec482ca440857568f0 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
aa8e21c Add new Qt3D demo
ca03367 Exclude demos from colibri imx6ull
a5345fd qtwebbrowser: merge changes from qtwebbrowser git repo
d7e9731 do not enable highdpiscaling on emulator
f730907 Fix mediaplayer default video path
09aa32d Fix some major scaling & font issues on ebike-demo
Change-Id: I044c29ea2908a6254f32b0623037ea63f23d25cb
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 |