From 304cf22b96092df1953faf584c2822e958ca40c1 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 30 Oct 2015 11:36:14 +0100 Subject: Remove BusyIndicator::indicator The indicator -property became redundant when contentItem was promoted to the Control base type. The content item is automatically resized to the available size, so it's even more convenient to use. Change-Id: I92435e1105171e45838ef1f49f653ad0f8d3152a Reviewed-by: Mitch Curtis --- src/imports/controls/BusyIndicator.qml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/imports/controls/BusyIndicator.qml') diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml index 60c8df54..3e7191c2 100644 --- a/src/imports/controls/BusyIndicator.qml +++ b/src/imports/controls/BusyIndicator.qml @@ -41,20 +41,16 @@ import Qt.labs.templates 1.0 as T T.BusyIndicator { id: control - implicitWidth: indicator.implicitWidth + leftPadding + rightPadding - implicitHeight: indicator.implicitHeight + topPadding + bottomPadding + implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding + implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding padding: 6 - //! [indicator] - indicator: Item { + //! [contentItem] + contentItem: Item { id: delegate implicitWidth: 48 implicitHeight: 48 - x: control.leftPadding + (control.availableWidth - width) / 2 - y: control.topPadding + (control.availableHeight - height) / 2 - width: control.availableWidth - height: control.availableHeight opacity: control.running ? 1 : 0 Behavior on opacity { OpacityAnimator { duration: 250 } } @@ -77,5 +73,5 @@ T.BusyIndicator { } } } - //! [indicator] + //! [contentItem] } -- cgit v1.2.3