From d329949fc83549a858afb1f7d57fd8ae60e38db8 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Thu, 19 Jun 2025 17:03:44 +1000 Subject: input: ripple anim for all buttons Also fix up colours for some statelayers Fix urgent notif action colours --- modules/dashboard/Tabs.qml | 9 +++------ modules/notifications/Notification.qml | 6 ++++-- modules/session/Content.qml | 1 + 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'modules') diff --git a/modules/dashboard/Tabs.qml b/modules/dashboard/Tabs.qml index f45bdea..e6b59e7 100644 --- a/modules/dashboard/Tabs.qml +++ b/modules/dashboard/Tabs.qml @@ -107,15 +107,12 @@ Item { cursorShape: Qt.PointingHandCursor - onPressed: ({ - x, - y - }) => { + onPressed: event => { tab.TabBar.tabBar.setCurrentIndex(tab.TabBar.index); const stateY = stateWrapper.y; - rippleAnim.x = x; - rippleAnim.y = y - stateY; + rippleAnim.x = event.x; + rippleAnim.y = event.y - stateY; const dist = (ox, oy) => ox * ox + oy * oy; const stateEndY = stateY + stateWrapper.height; diff --git a/modules/notifications/Notification.qml b/modules/notifications/Notification.qml index 55f17a2..1f21fc4 100644 --- a/modules/notifications/Notification.qml +++ b/modules/notifications/Notification.qml @@ -358,6 +358,7 @@ StyledRect { StateLayer { radius: Appearance.rounding.full + color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface function onClicked() { root.expanded = !root.expanded; @@ -457,7 +458,7 @@ StyledRect { required property NotificationAction modelData radius: Appearance.rounding.full - color: Colours.palette.m3surfaceContainerHigh + color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondary : Colours.palette.m3surfaceContainerHigh Layout.preferredWidth: actionText.width + Appearance.padding.normal * 2 Layout.preferredHeight: actionText.height + Appearance.padding.small * 2 @@ -466,6 +467,7 @@ StyledRect { StateLayer { radius: Appearance.rounding.full + color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondary : Colours.palette.m3onSurface function onClicked(): void { action.modelData.invoke(); @@ -477,7 +479,7 @@ StyledRect { anchors.centerIn: parent text: actionTextMetrics.elidedText - color: Colours.palette.m3onSurfaceVariant + color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondary : Colours.palette.m3onSurfaceVariant font.pointSize: Appearance.font.size.small } diff --git a/modules/session/Content.qml b/modules/session/Content.qml index f6b1258..707a1b9 100644 --- a/modules/session/Content.qml +++ b/modules/session/Content.qml @@ -102,6 +102,7 @@ Column { StateLayer { radius: parent.radius + color: button.activeFocus ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface function onClicked(): void { proc.startDetached(); -- cgit v1.2.3-freya