From 7b971c28e6098b629b8e9e3e38a9465a3f1bd459 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 8 Apr 2015 18:16:13 +0200 Subject: Rename Style to Theme Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60 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 acd6f7ac..0a78011e 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: Theme.padding + topPadding: Theme.padding + (label && title ? label.implicitHeight + Theme.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.Theme.textColor elide: Text.ElideRight - opacity: enabled ? 1.0 : control.Style.disabledOpacity + opacity: enabled ? 1.0 : control.Theme.disabledOpacity horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } frame: Rectangle { - y: control.topPadding - control.Style.padding + y: control.topPadding - control.Theme.padding width: parent.width - height: parent.height - control.topPadding + control.Style.padding + height: parent.height - control.topPadding + control.Theme.padding color: "transparent" - radius: control.Style.roundness - border.color: control.Style.frameColor + radius: control.Theme.roundness + border.color: control.Theme.frameColor } } -- cgit v1.2.3