diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-01-17 10:51:58 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-01-17 14:22:21 +0000 |
| commit | 6c831d8e8a5007e0309f81f6263562b078046607 (patch) | |
| tree | 3529e770b6fd592d63f29afdb95c8226bb4a5fa3 | |
| parent | da7d894deb4cc36155ade5e6a1ebecc3262363f8 (diff) | |
Tumbler: qualify references to visibleItemCount with "control"
This code currently works, but we prefer to use control.<property> to
access properties directly.
Change-Id: Ieba95bffdd0b0a9b33373524248d0ac06e9f2a3d
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | src/imports/controls/Tumbler.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/Tumbler.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/Tumbler.qml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml index e9cbf97d..15ad876d 100644 --- a/src/imports/controls/Tumbler.qml +++ b/src/imports/controls/Tumbler.qml @@ -48,7 +48,7 @@ T.Tumbler { text: modelData color: control.visualFocus ? Default.focusColor : Default.textDarkColor font: control.font - opacity: (1.0 - Math.abs(Tumbler.displacement) / (visibleItemCount / 2)) * (control.enabled ? 1 : 0.6) + opacity: (1.0 - Math.abs(Tumbler.displacement) / (control.visibleItemCount / 2)) * (control.enabled ? 1 : 0.6) horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml index b3645587..cc37d541 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml @@ -56,7 +56,7 @@ Tumbler { font: control.font horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter - opacity: 1.0 - Math.abs(Tumbler.displacement) / (visibleItemCount / 2) + opacity: 1.0 - Math.abs(Tumbler.displacement) / (control.visibleItemCount / 2) } Rectangle { diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml index 76e6124e..97628fc4 100644 --- a/src/imports/controls/material/Tumbler.qml +++ b/src/imports/controls/material/Tumbler.qml @@ -49,7 +49,7 @@ T.Tumbler { text: modelData color: control.Material.foreground font: control.font - opacity: (1.0 - Math.abs(Tumbler.displacement) / (visibleItemCount / 2)) * (control.enabled ? 1 : 0.6) + opacity: (1.0 - Math.abs(Tumbler.displacement) / (control.visibleItemCount / 2)) * (control.enabled ? 1 : 0.6) horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml index 9da9d56e..9972fb4c 100644 --- a/src/imports/controls/universal/Tumbler.qml +++ b/src/imports/controls/universal/Tumbler.qml @@ -50,7 +50,7 @@ T.Tumbler { text: modelData font: control.font color: control.Universal.foreground - opacity: (1.0 - Math.abs(Tumbler.displacement) / (visibleItemCount / 2)) * (control.enabled ? 1 : 0.6) + opacity: (1.0 - Math.abs(Tumbler.displacement) / (control.visibleItemCount / 2)) * (control.enabled ? 1 : 0.6) horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } |