aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2016-05-03 15:44:09 +0200
committerMitch Curtis <mitch.curtis@qt.io>2016-05-03 13:50:51 +0000
commit263794609f6c9fa010d47dfff9a19bdc20d1c20c (patch)
tree8f6933cea194b24a9d1016da272a739e6aabcecf /src/imports/controls/material
parent10d3752a2639d11d470a1b888cc6e92c627cb0d7 (diff)
Improve Tumbler's delegate opacity for all styles
This makes the fade-out effect more gradual: Before: http://i.imgur.com/gNyHh1y.png After: http://i.imgur.com/fsC17UE.png With: import QtQuick 2.6 import QtQuick.Window 2.2 import QtQuick.Controls 2.0 Window { width: 300 height: 300 visible: true Tumbler { model: 15 visibleItemCount: 5 anchors.centerIn: parent } } Change-Id: I7774b7a59eb2e6c15299325780f13afbc220a374 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/material')
-rw-r--r--src/imports/controls/material/Tumbler.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml
index 8ac8a7c4..67baa82a 100644
--- a/src/imports/controls/material/Tumbler.qml
+++ b/src/imports/controls/material/Tumbler.qml
@@ -50,7 +50,7 @@ T.Tumbler {
text: modelData
color: control.Material.primaryTextColor
font: control.font
- opacity: 0.4 + Math.max(0, 1 - Math.abs(Tumbler.displacement)) * 0.6
+ opacity: (1.0 - Math.abs(Tumbler.displacement) / (visibleItemCount / 2)) * (control.enabled ? 1 : 0.6)
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}