From a3921bcf01275425350c9c153fe92086a34d1403 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 6 Mar 2015 11:52:10 +0100 Subject: Implement Style as an attached property Change-Id: I006ee566647e31d1a14919d164d7dd68539aae10 Reviewed-by: Jari-Pekka Nurmi --- src/imports/controls/GroupBox.qml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/imports/controls/GroupBox.qml') diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index 773f1092..acd6f7ac 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -50,8 +50,8 @@ AbstractGroupBox { contentWidth: content.children.length === 1 ? content.children[0].implicitWidth : 0 contentHeight: content.children.length === 1 ? content.children[0].implicitHeight : 0 - padding: style.padding - topPadding: style.padding + (label && title ? label.implicitHeight + style.spacing : 0) + padding: Style.padding + topPadding: Style.padding + (label && title ? label.implicitHeight + Style.spacing : 0) contentItem: Item { id: content @@ -66,20 +66,20 @@ AbstractGroupBox { width: parent.width - control.leftPadding - control.rightPadding text: control.title - color: control.style.textColor + color: control.Style.textColor elide: Text.ElideRight - opacity: enabled ? 1.0 : control.style.disabledOpacity + opacity: enabled ? 1.0 : control.Style.disabledOpacity horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } frame: Rectangle { - y: control.topPadding - style.padding + y: control.topPadding - control.Style.padding width: parent.width - height: parent.height - control.topPadding + style.padding + height: parent.height - control.topPadding + control.Style.padding color: "transparent" - radius: style.roundness - border.color: style.frameColor + radius: control.Style.roundness + border.color: control.Style.frameColor } } -- cgit v1.2.3