diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:15:48 +0300 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-24 09:01:19 +0000 |
| commit | 2aa0c5015e26e1374f6b24ee7023adc58e380403 (patch) | |
| tree | ea142c2a863fb250b83d3edb49b176f66713d7f7 /src/imports/controls/universal/TabButton.qml | |
| parent | 9248d01f4817707adb522ebe09fb74c0ba176f2e (diff) | |
TabButton: add support for icons
Task-number: QTBUG-49820
Change-Id: I9ab7044d5f5809c8b922c5a8a4f1fa9eb2233139
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/universal/TabButton.qml')
| -rw-r--r-- | src/imports/controls/universal/TabButton.qml | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml index 88a98a71..054f65f5 100644 --- a/src/imports/controls/universal/TabButton.qml +++ b/src/imports/controls/universal/TabButton.qml @@ -36,6 +36,8 @@ import QtQuick 2.9 import QtQuick.Templates 2.3 as T +import QtQuick.Controls 2.3 +import QtQuick.Controls.impl 2.3 import QtQuick.Controls.Universal 2.3 T.TabButton { @@ -48,15 +50,22 @@ T.TabButton { baselineOffset: contentItem.y + contentItem.baselineOffset padding: 12 // PivotItemMargin + spacing: 8 - contentItem: Text { + icon.width: 20 + icon.height: 20 + icon.color: Color.transparent(control.hovered ? control.Universal.baseMediumHighColor : control.Universal.foreground, + control.checked || control.down || control.hovered ? 1.0 : 0.2) + + contentItem: IconLabel { + spacing: control.spacing + mirrored: control.mirrored + display: control.display + + icon: control.icon text: control.text font: control.font - elide: Text.ElideRight - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - - opacity: control.checked || control.down || control.hovered ? 1.0 : 0.2 - color: control.hovered ? control.Universal.baseMediumHighColor : control.Universal.foreground + color: Color.transparent(control.hovered ? control.Universal.baseMediumHighColor : control.Universal.foreground, + control.checked || control.down || control.hovered ? 1.0 : 0.2) } } |