From a2b729a6f9d7d165c201e172760d7fd7d7f0912e Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 23 Jun 2015 23:15:52 +0200 Subject: Declare PageIndicator::delegate in C++ Change-Id: I9785794a08579777c46b9ec46b0b426ce77334e9 Reviewed-by: J-P Nurmi --- src/imports/controls/PageIndicator.qml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'src/imports/controls/PageIndicator.qml') diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml index bb6d59e2..733c4a13 100644 --- a/src/imports/controls/PageIndicator.qml +++ b/src/imports/controls/PageIndicator.qml @@ -42,7 +42,17 @@ AbstractPageIndicator { property alias spacing: row.spacing - property Component delegate: Rectangle { + Accessible.role: Accessible.Indicator + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + + padding: Theme.padding + + //! [delegate] + delegate: Rectangle { implicitWidth: 8 implicitHeight: 8 @@ -52,15 +62,7 @@ AbstractPageIndicator { opacity: index === currentIndex ? 0.75 : 0.25 Behavior on opacity { OpacityAnimator { duration: 100 } } } - - Accessible.role: Accessible.Indicator - - implicitWidth: Math.max(background ? background.implicitWidth : 0, - contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(background ? background.implicitHeight : 0, - contentItem.implicitHeight + topPadding + bottomPadding) - - padding: Theme.padding + //! [delegate] //! [contentItem] contentItem: Row { -- cgit v1.2.3