diff options
| -rw-r--r-- | modules/launcher/AppItem.qml | 2 | ||||
| -rw-r--r-- | widgets/StyledScrollBar.qml | 39 |
2 files changed, 29 insertions, 12 deletions
diff --git a/modules/launcher/AppItem.qml b/modules/launcher/AppItem.qml index 473797a..ca1b611 100644 --- a/modules/launcher/AppItem.qml +++ b/modules/launcher/AppItem.qml @@ -48,7 +48,7 @@ PaddedRect { } StyledText { - text: qsTr(root.modelData.comment || root.modelData.genericName || root.modelData.name) + text: root.modelData.comment || root.modelData.genericName || root.modelData.name font.pointSize: Appearance.font.size.small color: Appearance.alpha(Appearance.colours.m3outline, true) diff --git a/widgets/StyledScrollBar.qml b/widgets/StyledScrollBar.qml index b341173..73b7451 100644 --- a/widgets/StyledScrollBar.qml +++ b/widgets/StyledScrollBar.qml @@ -6,25 +6,42 @@ ScrollBar { id: root contentItem: StyledRect { - opacity: 0 + opacity: root.pressed ? 0.8 : root.policy === ScrollBar.AlwaysOn || (root.active && root.size < 1) ? 0.6 : 0 radius: Appearance.rounding.full - color: Qt.alpha(Appearance.colours.m3secondary, 0.6) + color: Appearance.colours.m3secondary + + Behavior on opacity { + NumberAnimation { + duration: Appearance.anim.durations.normal + easing.type: Easing.BezierSpline + easing.bezierCurve: Appearance.anim.curves.standard + } + } } background: StyledRect { implicitWidth: 10 - opacity: 0 + opacity: root.policy === ScrollBar.AlwaysOn || (root.active && root.size < 1) ? 0.4 : 0 radius: Appearance.rounding.full - color: Qt.alpha(Appearance.colours.m3surfaceContainerLow, 0.4) + color: Appearance.colours.m3surfaceContainerLow - MouseArea { - anchors.fill: parent - onWheel: event => { - if (event.angleDelta.y > 0) - root.decrease(); - else if (event.angleDelta.y < 0) - root.increase(); + Behavior on opacity { + NumberAnimation { + duration: Appearance.anim.durations.normal + easing.type: Easing.BezierSpline + easing.bezierCurve: Appearance.anim.curves.standard } } } + + MouseArea { + z: -1 + anchors.fill: parent + onWheel: event => { + if (event.angleDelta.y > 0) + root.decrease(); + else if (event.angleDelta.y < 0) + root.increase(); + } + } } |