From d7e3be861f25b66b425587880171b4a7f7fd7eba Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Thu, 7 Aug 2025 17:05:45 +1000 Subject: internal: fix transparent transitions --- components/controls/StyledRadioButton.qml | 2 +- components/filedialog/FolderContents.qml | 2 +- components/filedialog/Sidebar.qml | 2 +- modules/controlcenter/NavRail.qml | 2 +- modules/controlcenter/bluetooth/Details.qml | 2 +- modules/controlcenter/bluetooth/DeviceList.qml | 4 ++-- modules/controlcenter/bluetooth/Settings.qml | 2 +- modules/dashboard/dash/Calendar.qml | 2 +- modules/lock/MediaPlaying.qml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/controls/StyledRadioButton.qml b/components/controls/StyledRadioButton.qml index 73fc836..7a44baa 100644 --- a/components/controls/StyledRadioButton.qml +++ b/components/controls/StyledRadioButton.qml @@ -36,7 +36,7 @@ RadioButton { implicitHeight: 8 radius: Appearance.rounding.full - color: root.checked ? Colours.palette.m3primary : "transparent" + color: Qt.alpha(Colours.palette.m3primary, root.checked ? 1 : 0) } Behavior on border.color { diff --git a/components/filedialog/FolderContents.qml b/components/filedialog/FolderContents.qml index 45930ba..57500c8 100644 --- a/components/filedialog/FolderContents.qml +++ b/components/filedialog/FolderContents.qml @@ -124,7 +124,7 @@ Item { implicitHeight: nonAnimHeight radius: Appearance.rounding.normal - color: GridView.isCurrentItem ? Colours.palette.m3surfaceContainerHighest : "transparent" + color: Qt.alpha(Colours.palette.m3surfaceContainerHighest, GridView.isCurrentItem ? 1 : 0) z: GridView.isCurrentItem || implicitHeight !== nonAnimHeight ? 1 : 0 clip: true diff --git a/components/filedialog/Sidebar.qml b/components/filedialog/Sidebar.qml index 82a1dd5..173b429 100644 --- a/components/filedialog/Sidebar.qml +++ b/components/filedialog/Sidebar.qml @@ -48,7 +48,7 @@ StyledRect { implicitHeight: placeInner.implicitHeight + Appearance.padding.normal * 2 radius: Appearance.rounding.full - color: selected ? Colours.palette.m3secondaryContainer : "transparent" + color: Qt.alpha(Colours.palette.m3secondaryContainer, selected ? 1 : 0) StateLayer { color: place.selected ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface diff --git a/modules/controlcenter/NavRail.qml b/modules/controlcenter/NavRail.qml index 3816048..3c3d7fd 100644 --- a/modules/controlcenter/NavRail.qml +++ b/modules/controlcenter/NavRail.qml @@ -210,7 +210,7 @@ Item { id: background radius: Appearance.rounding.full - color: item.active ? Colours.palette.m3secondaryContainer : "transparent" + color: Qt.alpha(Colours.palette.m3secondaryContainer, item.active ? 1 : 0) implicitWidth: icon.implicitWidth + icon.anchors.leftMargin * 2 implicitHeight: icon.implicitHeight + Appearance.padding.small diff --git a/modules/controlcenter/bluetooth/Details.qml b/modules/controlcenter/bluetooth/Details.qml index f856002..dc1cc9b 100644 --- a/modules/controlcenter/bluetooth/Details.qml +++ b/modules/controlcenter/bluetooth/Details.qml @@ -266,7 +266,7 @@ Item { implicitHeight: editIcon.implicitHeight + Appearance.padding.smaller * 2 radius: root.session.bt.editingDeviceName ? Appearance.rounding.small : implicitHeight / 2 - color: root.session.bt.editingDeviceName ? Colours.palette.m3primary : "transparent" + color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingDeviceName ? 1 : 0) StateLayer { color: root.session.bt.editingDeviceName ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface diff --git a/modules/controlcenter/bluetooth/DeviceList.qml b/modules/controlcenter/bluetooth/DeviceList.qml index 839f6ad..cc0a966 100644 --- a/modules/controlcenter/bluetooth/DeviceList.qml +++ b/modules/controlcenter/bluetooth/DeviceList.qml @@ -167,7 +167,7 @@ ColumnLayout { anchors.right: parent.right implicitHeight: deviceInner.implicitHeight + Appearance.padding.normal * 2 - color: root.session.bt.active === modelData ? Colours.palette.m3surfaceContainer : "transparent" + color: Qt.alpha(Colours.palette.m3surfaceContainer, root.session.bt.active === modelData ? 1 : 0) radius: Appearance.rounding.normal StateLayer { @@ -241,7 +241,7 @@ ColumnLayout { implicitHeight: connectIcon.implicitHeight + Appearance.padding.small * 2 radius: Appearance.rounding.full - color: device.connected ? Colours.palette.m3primaryContainer : "transparent" + color: Qt.alpha(Colours.palette.m3primaryContainer, device.connected ? 1 : 0) StyledBusyIndicator { anchors.centerIn: parent diff --git a/modules/controlcenter/bluetooth/Settings.qml b/modules/controlcenter/bluetooth/Settings.qml index f298432..f2801a0 100644 --- a/modules/controlcenter/bluetooth/Settings.qml +++ b/modules/controlcenter/bluetooth/Settings.qml @@ -426,7 +426,7 @@ ColumnLayout { implicitHeight: editIcon.implicitHeight + Appearance.padding.smaller * 2 radius: root.session.bt.editingAdapterName ? Appearance.rounding.small : implicitHeight / 2 - color: root.session.bt.editingAdapterName ? Colours.palette.m3primary : "transparent" + color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingAdapterName ? 1 : 0) StateLayer { color: root.session.bt.editingAdapterName ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface diff --git a/modules/dashboard/dash/Calendar.qml b/modules/dashboard/dash/Calendar.qml index 51771cc..fa027c4 100644 --- a/modules/dashboard/dash/Calendar.qml +++ b/modules/dashboard/dash/Calendar.qml @@ -55,7 +55,7 @@ Column { implicitHeight: parent.implicitHeight radius: Appearance.rounding.full - color: day.model.today ? Colours.palette.m3primary : "transparent" + color: Qt.alpha(Colours.palette.m3primary, day.model.today ? 1 : 0) StyledText { id: text diff --git a/modules/lock/MediaPlaying.qml b/modules/lock/MediaPlaying.qml index 2ebd177..79c454f 100644 --- a/modules/lock/MediaPlaying.qml +++ b/modules/lock/MediaPlaying.qml @@ -229,7 +229,7 @@ RowLayout { implicitHeight: implicitWidth radius: Appearance.rounding.full - color: primary && canUse ? Colours.palette.m3primary : "transparent" + color: Qt.alpha(Colours.palette.m3primary, primary && canUse ? 1 : 0) StateLayer { disabled: !control.canUse -- cgit v1.2.3-freya