diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-18 12:19:27 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-18 11:29:45 +0000 |
| commit | 26056b52b182b4452855f54a2c811d64246c434a (patch) | |
| tree | f30a5afdc278f39515600bd9da5e8a187357d943 | |
| parent | 8244e2e36af2f6923c5be586da37c0facf7152a8 (diff) | |
Imagine/Switch(Delegate): cleanup internal IDs for deferred execution
Task-number: QTBUG-50992
Change-Id: I621343bef562b4ed85202a0690a0cccfc0a053c5
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/imagine/Switch.qml | 5 | ||||
| -rw-r--r-- | src/imports/controls/imagine/SwitchDelegate.qml | 5 | ||||
| -rw-r--r-- | tests/auto/sanity/BLACKLIST | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/imports/controls/imagine/Switch.qml b/src/imports/controls/imagine/Switch.qml index 6d69502d..c7cc8ecb 100644 --- a/src/imports/controls/imagine/Switch.qml +++ b/src/imports/controls/imagine/Switch.qml @@ -74,12 +74,13 @@ T.Switch { ] } - NinePatchImage { - id: handle + property NinePatchImage handle: NinePatchImage { readonly property real minPos: parent.leftPadding - leftPadding readonly property real maxPos: parent.width - width + rightPadding - parent.rightPadding readonly property real dragPos: control.visualPosition * parent.width - (width / 2) + parent: control.indicator + x: Math.max(minPos, Math.min(maxPos, control.visualPosition * parent.width - (width / 2))) y: (parent.height - height) / 2 diff --git a/src/imports/controls/imagine/SwitchDelegate.qml b/src/imports/controls/imagine/SwitchDelegate.qml index 0c9bfb15..625595d7 100644 --- a/src/imports/controls/imagine/SwitchDelegate.qml +++ b/src/imports/controls/imagine/SwitchDelegate.qml @@ -81,12 +81,13 @@ T.SwitchDelegate { ] } - NinePatchImage { - id: handle + property NinePatchImage handle: NinePatchImage { readonly property real minPos: parent.leftPadding - leftPadding readonly property real maxPos: parent.width - width + rightPadding - parent.rightPadding readonly property real dragPos: control.visualPosition * parent.width - (width / 2) + parent: control.indicator + x: Math.max(minPos, Math.min(maxPos, control.visualPosition * parent.width - (width / 2))) y: (parent.height - height) / 2 diff --git a/tests/auto/sanity/BLACKLIST b/tests/auto/sanity/BLACKLIST index a595d354..42ad3448 100644 --- a/tests/auto/sanity/BLACKLIST +++ b/tests/auto/sanity/BLACKLIST @@ -2,7 +2,3 @@ * [attachedObjects:material/SwitchDelegate.qml] * -[ids:imagine/Switch.qml] -* -[ids:imagine/SwitchDelegate.qml] -* |