diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-03-20 11:15:46 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-24 06:34:20 +0000 |
| commit | a7d9818dd414565cdcc4f4c9415f67735d146c68 (patch) | |
| tree | c2629d10b60f1fc7b6466d7217156f774397a44f /src/imports/controls/universal | |
| parent | b0d2e6d13358cc30f044504f83bd584606b6c235 (diff) | |
Button: add support for icons
Task-number: QTBUG-49820
Change-Id: I7f2a72a4ef199d31b2b0041fdad42cfeb15f7b54
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/Button.qml | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml index d1a312e5..5b6951a5 100644 --- a/src/imports/controls/universal/Button.qml +++ b/src/imports/controls/universal/Button.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.Button { @@ -50,18 +52,35 @@ T.Button { padding: 8 topPadding: padding - 4 bottomPadding: padding - 4 + spacing: 8 + + icon.width: 20 + icon.height: 20 + icon.color: enabled ? undefined : Color.transparent(Universal.foreground, 0.2) property bool useSystemFocusVisuals: true - contentItem: Text { - text: control.text - font: control.font - elide: Text.ElideRight - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter + contentItem: DisplayLayout { + spacing: control.spacing + mirrored: control.mirrored - opacity: enabled ? 1.0 : 0.2 - color: control.Universal.foreground + icon: IconImage { + id: iconImage + name: control.icon.name + source: control.icon.source + sourceSize.width: control.icon.width + sourceSize.height: control.icon.height + color: control.icon.color + } + text: Text { + text: control.text + font: control.font + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + opacity: enabled ? 1.0 : 0.2 + color: control.Universal.foreground + } } background: Rectangle { |