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/ConfigurationDrawer.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/ConfigurationDrawer.qml')
| -rw-r--r-- | basicsuite/ebike-ui/ConfigurationDrawer.qml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/basicsuite/ebike-ui/ConfigurationDrawer.qml b/basicsuite/ebike-ui/ConfigurationDrawer.qml index 258a264..f6f6094 100644 --- a/basicsuite/ebike-ui/ConfigurationDrawer.qml +++ b/basicsuite/ebike-ui/ConfigurationDrawer.qml @@ -55,17 +55,16 @@ Drawer { anchors { left: parent.left right: parent.right - leftMargin: UILayout.curtainMargin - rightMargin: UILayout.curtainMargin + leftMargin: root.width * 0.025 + rightMargin: root.width * 0.025 } - height: UILayout.tabBarTabHeight + contentHeight: parent.height * 0.175 background: Rectangle { color: Colors.curtainBackground } IconifiedTabButton { id: bikeInfoTabButton - height: parent.height bar: bar deselectedIcon: "images/info.png" selectedIcon: "images/info_selected.png" @@ -73,7 +72,6 @@ Drawer { IconifiedTabButton { id: configurationTabButton - height: parent.height bar: bar deselectedIcon: "images/settings.png" selectedIcon: "images/settings_selected.png" @@ -81,7 +79,6 @@ Drawer { IconifiedTabButton { id: viewTabButton - height: parent.height bar: bar deselectedIcon: "images/list.png" selectedIcon: "images/list_selected.png" @@ -94,10 +91,10 @@ Drawer { left: parent.left right: parent.right top: bar.bottom - leftMargin: UILayout.curtainMargin - rightMargin: UILayout.curtainMargin + leftMargin: parent.width * 0.025 + rightMargin: parent.width * 0.025 + bottom: parent.bottom } - height: 290 currentIndex: bar.currentIndex BikeInfoTab { @@ -124,12 +121,12 @@ Drawer { id: drawerClose anchors { top: stackLayout.bottom + topMargin: -stackLayout.height * 0.01 left: parent.left right: parent.right } - width: parent.width - height: drawerCloseImage.implicitHeight + height: drawerCloseImage.height color: "transparent" Image { @@ -137,6 +134,9 @@ Drawer { source: "images/curtain_shadow_handle.png" anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.top + width: root.width * 0.2 + height: root.height * 0.07 + fillMode: Image.PreserveAspectFit } MouseArea { |