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/IconifiedTabButton.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/IconifiedTabButton.qml')
-rw-r--r-- | basicsuite/ebike-ui/IconifiedTabButton.qml | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/basicsuite/ebike-ui/IconifiedTabButton.qml b/basicsuite/ebike-ui/IconifiedTabButton.qml index 572ce51..4762d94 100644 --- a/basicsuite/ebike-ui/IconifiedTabButton.qml +++ b/basicsuite/ebike-ui/IconifiedTabButton.qml @@ -43,27 +43,24 @@ TabButton { property string selectedIcon property var bar - contentItem: Image { - width: UILayout.tabButtonIconWidth - height: UILayout.tabButtonIconHeight - source: bar.currentItem === parent ? selectedIcon : deselectedIcon - fillMode: Image.Pad - anchors { - top: parent.top - topMargin: UILayout.tabButtonTopMargin - horizontalCenter: parent.horizontalCenter - } - } - background: Rectangle { color: Colors.tabBackground - height: parent.height + + Image { + height: parent.height + width: height + source: bar.currentItem === parent.parent ? selectedIcon : deselectedIcon + fillMode: Image.PreserveAspectFit + anchors.centerIn: parent + + } Rectangle { visible: bar.currentItem === parent.parent width: parent.width height: 2 anchors.bottom: parent.bottom + anchors.bottomMargin: height color: Colors.activeTabBorder } } |