diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-07-02 12:27:53 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-07-06 10:41:09 +0000 |
commit | 36c40a1cebe522e2655ab05d4e461eddbed364c7 (patch) | |
tree | b8d714cd20904933384e04a1209790c2a8625d18 /src/imports/controls/Button.qml | |
parent | 44cb549108913757277bd266c64aac9b2f6e6e8e (diff) |
Remove non-color properties from Theme
Better start with a minimal set. It will be also easier to transition
from Theme to Palette if it gets done.
Change-Id: Ic9951ac5b913f99a84e2b8efb9ae7f8d61177aee
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Diffstat (limited to 'src/imports/controls/Button.qml')
-rw-r--r-- | src/imports/controls/Button.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 899b3d3c..d46ecf22 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -49,7 +49,7 @@ AbstractButton { Accessible.pressed: pressed Accessible.role: Accessible.Button - padding: Theme.padding + padding: 6 //! [label] label: Text { @@ -71,7 +71,7 @@ AbstractButton { implicitWidth: 26 implicitHeight: 26 - radius: control.Theme.roundness + radius: 3 color: Qt.tint(!control.enabled ? control.Theme.disabledColor : control.activeFocus ? control.Theme.focusColor : control.Theme.accentColor, control.pressed ? control.Theme.pressColor : "transparent") |