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/GroupBox.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/GroupBox.qml')
| -rw-r--r-- | src/imports/controls/GroupBox.qml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index 7a625a81..94cc528d 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -46,9 +46,9 @@ AbstractGroupBox { contentWidth: contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0 contentHeight: contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0 - spacing: Theme.spacing - padding: Theme.padding - topPadding: Theme.padding + (label && title ? label.implicitHeight + spacing : 0) + spacing: 6 + padding: 6 + topPadding: 6 + (label && title ? label.implicitHeight + spacing : 0) //! [contentItem] contentItem: Item { } @@ -69,12 +69,12 @@ AbstractGroupBox { //! [frame] frame: Rectangle { - y: control.topPadding - control.Theme.padding + y: control.topPadding - control.padding width: parent.width - height: parent.height - control.topPadding + control.Theme.padding + height: parent.height - control.topPadding + control.padding + radius: 3 color: "transparent" - radius: control.Theme.roundness border.color: control.Theme.frameColor } //! [frame] |