diff --git a/Components/CustomAudioSlider.qml b/Components/CustomAudioSlider.qml index f7d35af..f896d83 100644 --- a/Components/CustomAudioSlider.qml +++ b/Components/CustomAudioSlider.qml @@ -19,7 +19,7 @@ Slider { bottomRightRadius: root.implicitHeight / 15 color: root.nonPeakColor implicitWidth: root.handle.x - root.implicitHeight - radius: 1000 + radius: Appearance.rounding.full topRightRadius: root.implicitHeight / 15 CustomRect { @@ -29,7 +29,7 @@ Slider { bottomRightRadius: root.implicitHeight / 15 color: root.peakColor implicitWidth: parent.width * root.peak - radius: 1000 + radius: Appearance.rounding.full topRightRadius: root.implicitHeight / 15 Behavior on implicitWidth { @@ -49,7 +49,7 @@ Slider { bottomLeftRadius: root.implicitHeight / 15 color: DynamicColors.tPalette.m3surfaceContainer implicitWidth: root.implicitWidth - root.handle.x - root.handle.implicitWidth - root.implicitHeight - radius: 1000 + radius: Appearance.rounding.full topLeftRadius: root.implicitHeight / 15 } } @@ -58,7 +58,7 @@ Slider { color: DynamicColors.palette.m3primary implicitHeight: 15 implicitWidth: 5 - radius: 1000 + radius: Appearance.rounding.full x: root.visualPosition * root.availableWidth - implicitWidth / 2 MouseArea { diff --git a/Components/CustomButton.qml b/Components/CustomButton.qml index adc521e..4b572bd 100644 --- a/Components/CustomButton.qml +++ b/Components/CustomButton.qml @@ -6,7 +6,7 @@ Button { id: control property color bgColor: DynamicColors.palette.m3primary - property int radius: 4 + property int radius: Appearance.rounding.smallest / 2 property color textColor: DynamicColors.palette.m3onPrimary background: CustomRect { diff --git a/Components/CustomCheckbox.qml b/Components/CustomCheckbox.qml index 55a728f..a00d407 100644 --- a/Components/CustomCheckbox.qml +++ b/Components/CustomCheckbox.qml @@ -22,7 +22,7 @@ CheckBox { color: DynamicColors.palette.m3surfaceVariant implicitHeight: control.checkHeight implicitWidth: control.checkWidth - radius: 4 + radius: Appearance.rounding.smallest / 2 CustomRect { color: DynamicColors.palette.m3primary diff --git a/Components/CustomRadioButton.qml b/Components/CustomRadioButton.qml index 7e743cb..481268b 100644 --- a/Components/CustomRadioButton.qml +++ b/Components/CustomRadioButton.qml @@ -25,7 +25,7 @@ RadioButton { color: "transparent" implicitHeight: 16 implicitWidth: 16 - radius: 1000 + radius: Appearance.rounding.full Behavior on border.color { CAnim { @@ -47,7 +47,7 @@ RadioButton { color: Qt.alpha(DynamicColors.palette.m3primary, root.checked ? 1 : 0) implicitHeight: 8 implicitWidth: 8 - radius: 1000 + radius: Appearance.rounding.full } } } diff --git a/Components/CustomScrollBar.qml b/Components/CustomScrollBar.qml index 1f0acbc..6597f99 100644 --- a/Components/CustomScrollBar.qml +++ b/Components/CustomScrollBar.qml @@ -29,7 +29,7 @@ ScrollBar { return 0.6; return 0; } - radius: 1000 + radius: Appearance.rounding.full Behavior on opacity { Anim { diff --git a/Components/CustomSlider.qml b/Components/CustomSlider.qml index 8a375aa..32c8f69 100644 --- a/Components/CustomSlider.qml +++ b/Components/CustomSlider.qml @@ -13,7 +13,7 @@ Slider { bottomRightRadius: root.implicitHeight / 6 color: DynamicColors.palette.m3primary implicitWidth: root.handle.x - root.implicitHeight / 2 - radius: 1000 + radius: Appearance.rounding.full topRightRadius: root.implicitHeight / 6 } @@ -24,7 +24,7 @@ Slider { bottomLeftRadius: root.implicitHeight / 6 color: DynamicColors.tPalette.m3surfaceContainer implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 2 - radius: 1000 + radius: Appearance.rounding.full topLeftRadius: root.implicitHeight / 6 } } @@ -33,7 +33,7 @@ Slider { color: DynamicColors.palette.m3primary implicitHeight: 15 implicitWidth: 5 - radius: 1000 + radius: Appearance.rounding.full x: root.visualPosition * root.availableWidth - implicitWidth / 2 MouseArea { diff --git a/Components/CustomSwitch.qml b/Components/CustomSwitch.qml index 15a54c2..aa6e069 100644 --- a/Components/CustomSwitch.qml +++ b/Components/CustomSwitch.qml @@ -15,7 +15,7 @@ Switch { color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer) implicitHeight: 13 + 7 * 2 implicitWidth: implicitHeight * 1.7 - radius: 1000 + radius: Appearance.rounding.full CustomRect { readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight @@ -24,7 +24,7 @@ Switch { color: root.checked ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1) implicitHeight: parent.implicitHeight - 10 implicitWidth: nonAnimWidth - radius: 1000 + radius: Appearance.rounding.full x: root.checked ? parent.implicitWidth - nonAnimWidth - 10 / 2 : 10 / 2 Behavior on implicitWidth { diff --git a/Components/CustomTooltipContent.qml b/Components/CustomTooltipContent.qml index 8c70d19..00a4270 100644 --- a/Components/CustomTooltipContent.qml +++ b/Components/CustomTooltipContent.qml @@ -22,7 +22,7 @@ Item { implicitHeight: shown ? (tooltipTextObject.implicitHeight + 2 * root.verticalPadding) : 0 implicitWidth: shown ? (tooltipTextObject.implicitWidth + 2 * root.horizontalPadding) : 0 opacity: shown ? 1 : 0 - radius: 8 + radius: Appearance.rounding.smallest Behavior on implicitHeight { Anim { diff --git a/Components/ExtraIndicator.qml b/Components/ExtraIndicator.qml index da0302c..34315e7 100644 --- a/Components/ExtraIndicator.qml +++ b/Components/ExtraIndicator.qml @@ -10,7 +10,7 @@ CustomRect { implicitHeight: count.implicitHeight + 4 * 2 implicitWidth: count.implicitWidth + 8 * 2 opacity: extra > 0 ? 1 : 0 - radius: 8 + radius: Appearance.rounding.smallest scale: extra > 0 ? 1 : 0.5 Behavior on opacity { diff --git a/Components/StateLayer.qml b/Components/StateLayer.qml index bde8ce3..53dc9e3 100644 --- a/Components/StateLayer.qml +++ b/Components/StateLayer.qml @@ -85,7 +85,7 @@ MouseArea { border.pixelAligned: false color: root.color opacity: 0 - radius: 1000 + radius: Appearance.rounding.full transform: Translate { x: -ripple.width / 2 diff --git a/Greeter/Components/CustomAudioSlider.qml b/Greeter/Components/CustomAudioSlider.qml index f7d35af..f896d83 100644 --- a/Greeter/Components/CustomAudioSlider.qml +++ b/Greeter/Components/CustomAudioSlider.qml @@ -19,7 +19,7 @@ Slider { bottomRightRadius: root.implicitHeight / 15 color: root.nonPeakColor implicitWidth: root.handle.x - root.implicitHeight - radius: 1000 + radius: Appearance.rounding.full topRightRadius: root.implicitHeight / 15 CustomRect { @@ -29,7 +29,7 @@ Slider { bottomRightRadius: root.implicitHeight / 15 color: root.peakColor implicitWidth: parent.width * root.peak - radius: 1000 + radius: Appearance.rounding.full topRightRadius: root.implicitHeight / 15 Behavior on implicitWidth { @@ -49,7 +49,7 @@ Slider { bottomLeftRadius: root.implicitHeight / 15 color: DynamicColors.tPalette.m3surfaceContainer implicitWidth: root.implicitWidth - root.handle.x - root.handle.implicitWidth - root.implicitHeight - radius: 1000 + radius: Appearance.rounding.full topLeftRadius: root.implicitHeight / 15 } } @@ -58,7 +58,7 @@ Slider { color: DynamicColors.palette.m3primary implicitHeight: 15 implicitWidth: 5 - radius: 1000 + radius: Appearance.rounding.full x: root.visualPosition * root.availableWidth - implicitWidth / 2 MouseArea { diff --git a/Greeter/Components/CustomButton.qml b/Greeter/Components/CustomButton.qml index adc521e..4b572bd 100644 --- a/Greeter/Components/CustomButton.qml +++ b/Greeter/Components/CustomButton.qml @@ -6,7 +6,7 @@ Button { id: control property color bgColor: DynamicColors.palette.m3primary - property int radius: 4 + property int radius: Appearance.rounding.smallest / 2 property color textColor: DynamicColors.palette.m3onPrimary background: CustomRect { diff --git a/Greeter/Components/CustomCheckbox.qml b/Greeter/Components/CustomCheckbox.qml index 55a728f..a00d407 100644 --- a/Greeter/Components/CustomCheckbox.qml +++ b/Greeter/Components/CustomCheckbox.qml @@ -22,7 +22,7 @@ CheckBox { color: DynamicColors.palette.m3surfaceVariant implicitHeight: control.checkHeight implicitWidth: control.checkWidth - radius: 4 + radius: Appearance.rounding.smallest / 2 CustomRect { color: DynamicColors.palette.m3primary diff --git a/Greeter/Components/CustomRadioButton.qml b/Greeter/Components/CustomRadioButton.qml index 7e743cb..481268b 100644 --- a/Greeter/Components/CustomRadioButton.qml +++ b/Greeter/Components/CustomRadioButton.qml @@ -25,7 +25,7 @@ RadioButton { color: "transparent" implicitHeight: 16 implicitWidth: 16 - radius: 1000 + radius: Appearance.rounding.full Behavior on border.color { CAnim { @@ -47,7 +47,7 @@ RadioButton { color: Qt.alpha(DynamicColors.palette.m3primary, root.checked ? 1 : 0) implicitHeight: 8 implicitWidth: 8 - radius: 1000 + radius: Appearance.rounding.full } } } diff --git a/Greeter/Components/CustomScrollBar.qml b/Greeter/Components/CustomScrollBar.qml index 1f0acbc..6597f99 100644 --- a/Greeter/Components/CustomScrollBar.qml +++ b/Greeter/Components/CustomScrollBar.qml @@ -29,7 +29,7 @@ ScrollBar { return 0.6; return 0; } - radius: 1000 + radius: Appearance.rounding.full Behavior on opacity { Anim { diff --git a/Greeter/Components/CustomSlider.qml b/Greeter/Components/CustomSlider.qml index 8a375aa..32c8f69 100644 --- a/Greeter/Components/CustomSlider.qml +++ b/Greeter/Components/CustomSlider.qml @@ -13,7 +13,7 @@ Slider { bottomRightRadius: root.implicitHeight / 6 color: DynamicColors.palette.m3primary implicitWidth: root.handle.x - root.implicitHeight / 2 - radius: 1000 + radius: Appearance.rounding.full topRightRadius: root.implicitHeight / 6 } @@ -24,7 +24,7 @@ Slider { bottomLeftRadius: root.implicitHeight / 6 color: DynamicColors.tPalette.m3surfaceContainer implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 2 - radius: 1000 + radius: Appearance.rounding.full topLeftRadius: root.implicitHeight / 6 } } @@ -33,7 +33,7 @@ Slider { color: DynamicColors.palette.m3primary implicitHeight: 15 implicitWidth: 5 - radius: 1000 + radius: Appearance.rounding.full x: root.visualPosition * root.availableWidth - implicitWidth / 2 MouseArea { diff --git a/Greeter/Components/CustomSwitch.qml b/Greeter/Components/CustomSwitch.qml index 15a54c2..aa6e069 100644 --- a/Greeter/Components/CustomSwitch.qml +++ b/Greeter/Components/CustomSwitch.qml @@ -15,7 +15,7 @@ Switch { color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer) implicitHeight: 13 + 7 * 2 implicitWidth: implicitHeight * 1.7 - radius: 1000 + radius: Appearance.rounding.full CustomRect { readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight @@ -24,7 +24,7 @@ Switch { color: root.checked ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1) implicitHeight: parent.implicitHeight - 10 implicitWidth: nonAnimWidth - radius: 1000 + radius: Appearance.rounding.full x: root.checked ? parent.implicitWidth - nonAnimWidth - 10 / 2 : 10 / 2 Behavior on implicitWidth { diff --git a/Greeter/Components/CustomTooltipContent.qml b/Greeter/Components/CustomTooltipContent.qml index 8c70d19..00a4270 100644 --- a/Greeter/Components/CustomTooltipContent.qml +++ b/Greeter/Components/CustomTooltipContent.qml @@ -22,7 +22,7 @@ Item { implicitHeight: shown ? (tooltipTextObject.implicitHeight + 2 * root.verticalPadding) : 0 implicitWidth: shown ? (tooltipTextObject.implicitWidth + 2 * root.horizontalPadding) : 0 opacity: shown ? 1 : 0 - radius: 8 + radius: Appearance.rounding.smallest Behavior on implicitHeight { Anim { diff --git a/Greeter/Components/ExtraIndicator.qml b/Greeter/Components/ExtraIndicator.qml index da0302c..34315e7 100644 --- a/Greeter/Components/ExtraIndicator.qml +++ b/Greeter/Components/ExtraIndicator.qml @@ -10,7 +10,7 @@ CustomRect { implicitHeight: count.implicitHeight + 4 * 2 implicitWidth: count.implicitWidth + 8 * 2 opacity: extra > 0 ? 1 : 0 - radius: 8 + radius: Appearance.rounding.smallest scale: extra > 0 ? 1 : 0.5 Behavior on opacity { diff --git a/Greeter/Components/StateLayer.qml b/Greeter/Components/StateLayer.qml index bde8ce3..53dc9e3 100644 --- a/Greeter/Components/StateLayer.qml +++ b/Greeter/Components/StateLayer.qml @@ -85,7 +85,7 @@ MouseArea { border.pixelAligned: false color: root.color opacity: 0 - radius: 1000 + radius: Appearance.rounding.full transform: Translate { x: -ripple.width / 2 diff --git a/Greeter/UserImage.qml b/Greeter/UserImage.qml index cc3bdfd..6d979b9 100644 --- a/Greeter/UserImage.qml +++ b/Greeter/UserImage.qml @@ -7,7 +7,7 @@ Item { ClippingRectangle { anchors.fill: parent - radius: 1000 + radius: Appearance.rounding.full Image { id: userImage diff --git a/Modules/AudioPopup.qml b/Modules/AudioPopup.qml index db8b4a9..3f4764b 100644 --- a/Modules/AudioPopup.qml +++ b/Modules/AudioPopup.qml @@ -124,12 +124,10 @@ Item { VolumesTab { id: vol - } DevicesTab { id: dev - } } } @@ -139,12 +137,10 @@ Item { ButtonGroup { id: sinks - } ButtonGroup { id: sources - } CustomText { @@ -210,7 +206,7 @@ Item { Layout.preferredHeight: 40 Layout.preferredWidth: 40 color: DynamicColors.palette.m3primary - radius: 1000 + radius: Appearance.rounding.full MaterialIcon { anchors.alignWhenCentered: false @@ -284,7 +280,7 @@ Item { Layout.preferredHeight: 40 Layout.preferredWidth: 40 color: DynamicColors.palette.m3primary - radius: 1000 + radius: Appearance.rounding.full MaterialIcon { anchors.alignWhenCentered: false @@ -372,7 +368,7 @@ Item { Layout.preferredHeight: 40 Layout.preferredWidth: 40 color: DynamicColors.palette.m3primary - radius: 1000 + radius: Appearance.rounding.full MaterialIcon { id: icon @@ -383,7 +379,7 @@ Item { text: "volume_up" StateLayer { - radius: 1000 + radius: Appearance.rounding.full onClicked: { appBox.modelData.audio.muted = !appBox.modelData.audio.muted; diff --git a/Modules/DashWidget.qml b/Modules/DashWidget.qml index 9131930..db4c417 100644 --- a/Modules/DashWidget.qml +++ b/Modules/DashWidget.qml @@ -15,7 +15,7 @@ CustomRect { anchors.topMargin: 6 color: DynamicColors.tPalette.m3surfaceContainer implicitWidth: 40 - radius: 1000 + radius: Appearance.rounding.full StateLayer { onClicked: { diff --git a/Modules/Dashboard/Dash/User.qml b/Modules/Dashboard/Dash/User.qml index 45e8ad8..80ee719 100644 --- a/Modules/Dashboard/Dash/User.qml +++ b/Modules/Dashboard/Dash/User.qml @@ -18,7 +18,7 @@ Row { color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2) implicitHeight: info.implicitHeight implicitWidth: info.implicitHeight - radius: 8 + radius: Appearance.rounding.smallest MaterialIcon { anchors.centerIn: parent diff --git a/Modules/Dashboard/Tabs.qml b/Modules/Dashboard/Tabs.qml index 0e05337..aed64b5 100644 --- a/Modules/Dashboard/Tabs.qml +++ b/Modules/Dashboard/Tabs.qml @@ -83,7 +83,7 @@ Item { anchors.top: parent.top color: DynamicColors.palette.m3primary implicitHeight: parent.implicitHeight * 2 - radius: 1000 + radius: Appearance.rounding.full } } @@ -184,7 +184,7 @@ Item { anchors.verticalCenter: parent.verticalCenter color: "transparent" implicitHeight: parent.height + 8 * 2 - radius: 8 + radius: Appearance.rounding.smallest CustomRect { id: stateLayer @@ -204,7 +204,7 @@ Item { color: tab.current ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurface opacity: 0 - radius: 1000 + radius: Appearance.rounding.full transform: Translate { x: -ripple.width / 2 diff --git a/Modules/DesktopIcons/DesktopIconDelegate.qml b/Modules/DesktopIcons/DesktopIconDelegate.qml index 1d77c9b..674a005 100644 --- a/Modules/DesktopIcons/DesktopIconDelegate.qml +++ b/Modules/DesktopIcons/DesktopIconDelegate.qml @@ -202,7 +202,7 @@ Item { anchors.margins: 4 color: "white" opacity: root.selectedIcons.includes(filePath) ? 0.2 : 0.0 - radius: 8 + radius: Appearance.rounding.smallest Behavior on opacity { Anim { @@ -262,7 +262,7 @@ Item { anchors.margins: 4 color: "white" opacity: parent.containsMouse ? 0.1 : 0.0 - radius: 8 + radius: Appearance.rounding.smallest Behavior on opacity { Anim { diff --git a/Modules/Launcher/Content.qml b/Modules/Launcher/Content.qml index 2365fca..3837ae4 100644 --- a/Modules/Launcher/Content.qml +++ b/Modules/Launcher/Content.qml @@ -50,7 +50,7 @@ Item { anchors.right: parent.right color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainer, 2) implicitHeight: Math.max(searchIcon.implicitHeight, search.implicitHeight, clearIcon.implicitHeight) - radius: 8 + radius: Appearance.rounding.smallest MaterialIcon { id: searchIcon diff --git a/Modules/Launcher/Items/AppItem.qml b/Modules/Launcher/Items/AppItem.qml index 25cf90d..b9be7b5 100644 --- a/Modules/Launcher/Items/AppItem.qml +++ b/Modules/Launcher/Items/AppItem.qml @@ -23,7 +23,7 @@ Item { root.visibilities.launcher = false; } - radius: 8 + radius: Appearance.rounding.smallest } Item { diff --git a/Modules/Lock/UserImage.qml b/Modules/Lock/UserImage.qml index 60fcfb0..a3fae8c 100644 --- a/Modules/Lock/UserImage.qml +++ b/Modules/Lock/UserImage.qml @@ -8,7 +8,7 @@ Item { ClippingRectangle { anchors.fill: parent - radius: 1000 + radius: Appearance.rounding.full Image { id: userImage diff --git a/Modules/Notifications/Content.qml b/Modules/Notifications/Content.qml index b153743..5da4ddf 100644 --- a/Modules/Notifications/Content.qml +++ b/Modules/Notifications/Content.qml @@ -51,7 +51,7 @@ Item { anchors.fill: parent anchors.margins: root.padding color: "transparent" - radius: 4 + radius: Appearance.rounding.smallest / 2 CustomListView { id: list @@ -126,7 +126,7 @@ Item { color: "transparent" implicitHeight: notif.implicitHeight implicitWidth: notif.implicitWidth - radius: 4 + radius: Appearance.rounding.smallest / 2 Notification { id: notif diff --git a/Modules/Notifications/Notification.qml b/Modules/Notifications/Notification.qml index aaa3579..f50561a 100644 --- a/Modules/Notifications/Notification.qml +++ b/Modules/Notifications/Notification.qml @@ -115,7 +115,7 @@ CustomRect { sourceComponent: ClippingRectangle { implicitHeight: Config.notifs.sizes.image implicitWidth: Config.notifs.sizes.image - radius: 1000 + radius: Appearance.rounding.full Image { anchors.fill: parent @@ -142,7 +142,7 @@ CustomRect { color: root.modelData.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3error : root.modelData.urgency === NotificationUrgency.Low ? DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 2) : DynamicColors.palette.m3secondaryContainer implicitHeight: root.hasImage ? Config.notifs.sizes.badge : Config.notifs.sizes.image implicitWidth: root.hasImage ? Config.notifs.sizes.badge : Config.notifs.sizes.image - radius: 1000 + radius: Appearance.rounding.full Loader { id: icon @@ -312,7 +312,7 @@ CustomRect { } color: root.modelData.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface - radius: 1000 + radius: Appearance.rounding.full } MaterialIcon { @@ -431,7 +431,7 @@ CustomRect { color: root.modelData.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3secondary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2) implicitHeight: actionText.height + 4 * 2 implicitWidth: actionText.width + 8 * 2 - radius: 1000 + radius: Appearance.rounding.full StateLayer { function onClicked(): void { @@ -439,7 +439,7 @@ CustomRect { } color: root.modelData.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3onSecondary : DynamicColors.palette.m3onSurface - radius: 1000 + radius: Appearance.rounding.full } CustomText { diff --git a/Modules/Notifications/Sidebar/Content.qml b/Modules/Notifications/Sidebar/Content.qml index 8ca9b36..888a5c4 100644 --- a/Modules/Notifications/Sidebar/Content.qml +++ b/Modules/Notifications/Sidebar/Content.qml @@ -19,7 +19,7 @@ Item { Layout.fillHeight: true Layout.fillWidth: true color: DynamicColors.tPalette.m3surfaceContainerLow - radius: 8 + radius: Appearance.rounding.smallest NotifDock { props: root.props diff --git a/Modules/Notifications/Sidebar/NotifDock.qml b/Modules/Notifications/Sidebar/NotifDock.qml index 4f1156e..98b5cc5 100644 --- a/Modules/Notifications/Sidebar/NotifDock.qml +++ b/Modules/Notifications/Sidebar/NotifDock.qml @@ -171,7 +171,7 @@ Item { font.pointSize: Math.round(18 * 1.2) icon: "clear_all" padding: 8 - radius: 8 + radius: Appearance.rounding.smallest onClicked: clearTimer.start() diff --git a/Modules/Notifications/Sidebar/NotifGroup.qml b/Modules/Notifications/Sidebar/NotifGroup.qml index 0f624b1..d0b6052 100644 --- a/Modules/Notifications/Sidebar/NotifGroup.qml +++ b/Modules/Notifications/Sidebar/NotifGroup.qml @@ -43,7 +43,7 @@ CustomRect { clip: true color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainer, 2) implicitHeight: content.implicitHeight + 10 * 2 - radius: 8 + radius: Appearance.rounding.smallest Component.onDestruction: { if (notifCount === 0 && expanded) @@ -100,7 +100,7 @@ CustomRect { CustomClippingRect { anchors.fill: parent color: root.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3error : root.urgency === NotificationUrgency.Low ? DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 3) : DynamicColors.palette.m3secondaryContainer - radius: 1000 + radius: Appearance.rounding.full Loader { anchors.centerIn: parent @@ -117,7 +117,7 @@ CustomRect { color: root.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3error : root.urgency === NotificationUrgency.Low ? DynamicColors.palette.m3surfaceContainerHigh : DynamicColors.palette.m3secondaryContainer implicitHeight: Config.notifs.sizes.badge implicitWidth: Config.notifs.sizes.badge - radius: 1000 + radius: Appearance.rounding.full CustomIcon { anchors.centerIn: parent @@ -168,7 +168,7 @@ CustomRect { color: root.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3error : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 3) implicitHeight: groupCount.implicitHeight + 10 implicitWidth: expandBtn.implicitWidth + 7 * 2 - radius: 1000 + radius: Appearance.rounding.full StateLayer { function onClicked(): void { diff --git a/Modules/Notifications/Sidebar/Utils/Cards/Toggles.qml b/Modules/Notifications/Sidebar/Utils/Cards/Toggles.qml index a98fc48..37db72c 100644 --- a/Modules/Notifications/Sidebar/Utils/Cards/Toggles.qml +++ b/Modules/Notifications/Sidebar/Utils/Cards/Toggles.qml @@ -16,7 +16,7 @@ CustomRect { Layout.fillWidth: true color: DynamicColors.tPalette.m3surfaceContainer implicitHeight: layout.implicitHeight + 18 * 2 - radius: 8 + radius: Appearance.rounding.smallest ColumnLayout { id: layout diff --git a/Modules/Notifications/Sidebar/Utils/IdleInhibit.qml b/Modules/Notifications/Sidebar/Utils/IdleInhibit.qml index 4c148f5..69fe505 100644 --- a/Modules/Notifications/Sidebar/Utils/IdleInhibit.qml +++ b/Modules/Notifications/Sidebar/Utils/IdleInhibit.qml @@ -11,7 +11,7 @@ CustomRect { clip: true color: DynamicColors.tPalette.m3surfaceContainer implicitHeight: layout.implicitHeight + (IdleInhibitor.enabled ? activeChip.implicitHeight + activeChip.anchors.topMargin : 0) + 18 * 2 - radius: 8 + radius: Appearance.rounding.smallest Behavior on implicitHeight { Anim { @@ -33,7 +33,7 @@ CustomRect { color: IdleInhibitor.enabled ? DynamicColors.palette.m3secondary : DynamicColors.palette.m3secondaryContainer implicitHeight: icon.implicitHeight + 7 * 2 implicitWidth: implicitHeight - radius: 1000 + radius: Appearance.rounding.full MaterialIcon { id: icon @@ -102,7 +102,7 @@ CustomRect { color: DynamicColors.palette.m3primary implicitHeight: activeText.implicitHeight + 10 * 2 implicitWidth: activeText.implicitWidth + 10 * 2 - radius: 1000 + radius: Appearance.rounding.full CustomText { id: activeText diff --git a/Modules/Polkit/Polkit.qml b/Modules/Polkit/Polkit.qml index 4304ae4..8485c8e 100644 --- a/Modules/Polkit/Polkit.qml +++ b/Modules/Polkit/Polkit.qml @@ -82,7 +82,7 @@ Scope { implicitHeight: layout.childrenRect.height + 28 implicitWidth: layout.childrenRect.width + 32 opacity: 0 - radius: 24 + radius: Appearance.rounding.small * 2 ColumnLayout { id: layout @@ -159,7 +159,7 @@ Scope { background: CustomRect { color: (polkitAgent.flow?.failed && passInput.text === "") ? DynamicColors.palette.m3error : DynamicColors.tPalette.m3surfaceVariant implicitHeight: 40 - radius: 8 + radius: Appearance.rounding.smallest } onAccepted: okButton.clicked() @@ -251,7 +251,7 @@ Scope { Layout.preferredWidth: 92 bgColor: DynamicColors.palette.m3surfaceContainer enabled: true - radius: 1000 + radius: Appearance.rounding.full text: "Details" textColor: DynamicColors.palette.m3onSurface @@ -274,7 +274,7 @@ Scope { Layout.preferredWidth: 76 bgColor: DynamicColors.palette.m3primary enabled: passInput.text.length > 0 || !!polkitAgent.flow?.isResponseRequired - radius: 1000 + radius: Appearance.rounding.full text: "OK" textColor: DynamicColors.palette.m3onPrimary @@ -293,7 +293,7 @@ Scope { Layout.preferredWidth: 76 bgColor: DynamicColors.palette.m3surfaceContainer enabled: passInput.text.length > 0 || !!polkitAgent.flow?.isResponseRequired - radius: 1000 + radius: Appearance.rounding.full text: "Cancel" textColor: DynamicColors.palette.m3onSurface @@ -327,7 +327,6 @@ Scope { PolkitAgent { id: polkitAgent - } Variants { diff --git a/Modules/TrayMenuPopout.qml b/Modules/TrayMenuPopout.qml index 709c8c0..41a7d1a 100644 --- a/Modules/TrayMenuPopout.qml +++ b/Modules/TrayMenuPopout.qml @@ -86,7 +86,7 @@ StackView { color: modelData.isSeparator ? DynamicColors.palette.m3outlineVariant : "transparent" implicitHeight: modelData.isSeparator ? 1 : children.implicitHeight implicitWidth: root.biggestWidth - radius: 4 + radius: Appearance.rounding.smallest / 2 Loader { id: children @@ -211,7 +211,7 @@ StackView { CustomRect { anchors.fill: parent color: DynamicColors.palette.m3secondaryContainer - radius: 4 + radius: Appearance.rounding.smallest / 2 StateLayer { function onClicked(): void { diff --git a/Modules/UPower/UPowerPopout.qml b/Modules/UPower/UPowerPopout.qml index c60c2d1..17b551b 100644 --- a/Modules/UPower/UPowerPopout.qml +++ b/Modules/UPower/UPowerPopout.qml @@ -37,7 +37,7 @@ Item { id: indicator color: DynamicColors.palette.m3primary - radius: 1000 + radius: Appearance.rounding.full state: profiles.current states: [ @@ -158,7 +158,7 @@ Item { } color: profiles.current === parent.icon ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface - radius: 1000 + radius: Appearance.rounding.full } MaterialIcon { diff --git a/Modules/WSOverview/OverviewPopout.qml b/Modules/WSOverview/OverviewPopout.qml index 636beaa..e3b8f3a 100644 --- a/Modules/WSOverview/OverviewPopout.qml +++ b/Modules/WSOverview/OverviewPopout.qml @@ -36,7 +36,7 @@ Item { Layout.preferredWidth: 320 + 10 border.color: "white" border.width: 1 - radius: 8 + radius: Appearance.rounding.smallest Repeater { model: workspacePreview.modelData.toplevels @@ -65,7 +65,7 @@ Item { border.width: 1 implicitHeight: preview.appPosition.height implicitWidth: preview.appPosition.width - radius: 4 + radius: Appearance.rounding.smallest / 2 x: preview.appPosition.x y: preview.appPosition.y - 3.4