From 7f011e92ed2a840e820cb7b55bcab70c38e35fc1 Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Mon, 15 Jul 2024 18:45:33 -0400 Subject: [PATCH] quicksettings: Use standard corner radius --- .../QuickSettingsFullDelegate.qml | 26 +++++++++---------- .../QuickSettingsMinimizedDelegate.qml | 22 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml index 6e7238d5..cdab8247 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml @@ -17,13 +17,13 @@ import org.kde.plasma.components 3.0 as PlasmaComponents QuickSettingsDelegate { id: root - + padding: Kirigami.Units.smallSpacing * 2 iconItem: icon - + // scale animation on press zoomScale: (ShellSettings.Settings.animationsEnabled && mouseArea.pressed) ? 0.9 : 1 - + background: Item { // very simple shadow for performance Rectangle { @@ -32,15 +32,15 @@ QuickSettingsDelegate { anchors.left: parent.left anchors.right: parent.right height: parent.height - - radius: Kirigami.Units.smallSpacing + + radius: Kirigami.Units.cornerRadius color: Qt.rgba(0, 0, 0, 0.075) } - + // background color Rectangle { anchors.fill: parent - radius: Kirigami.Units.smallSpacing + radius: Kirigami.Units.cornerRadius border.width: 1 border.color: root.enabled ? root.enabledButtonBorderColor : root.disabledButtonBorderColor color: { @@ -52,23 +52,23 @@ QuickSettingsDelegate { } } } - + MobileShell.HapticsEffect { id: haptics } - + contentItem: MouseArea { id: mouseArea - + onPressed: haptics.buttonVibrate() onClicked: root.delegateClick() onPressAndHold: { haptics.buttonVibrate(); root.delegatePressAndHold(); } - + cursorShape: Qt.PointingHandCursor - + Kirigami.Icon { id: icon anchors.top: parent.top @@ -77,7 +77,7 @@ QuickSettingsDelegate { implicitHeight: width source: root.icon } - + ColumnLayout { id: column spacing: Kirigami.Units.smallSpacing diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml index 4d254f6b..e313902e 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml @@ -19,10 +19,10 @@ QuickSettingsDelegate { id: root iconItem: icon - + // scale animation on press zoomScale: (ShellSettings.Settings.animationsEnabled && mouseArea.pressed) ? 0.9 : 1 - + background: Item { // very simple shadow for performance Rectangle { @@ -31,15 +31,15 @@ QuickSettingsDelegate { anchors.left: parent.left anchors.right: parent.right height: parent.height - - radius: Kirigami.Units.smallSpacing + + radius: Kirigami.Units.cornerRadius color: Qt.rgba(0, 0, 0, 0.075) } - + // background Rectangle { anchors.fill: parent - radius: Kirigami.Units.smallSpacing + radius: Kirigami.Units.cornerRadius border.color: root.enabled ? root.enabledButtonBorderColor : root.disabledButtonBorderColor color: { if (root.enabled) { @@ -50,23 +50,23 @@ QuickSettingsDelegate { } } } - + MobileShell.HapticsEffect { id: haptics } - + contentItem: MouseArea { id: mouseArea - + onPressed: haptics.buttonVibrate(); onClicked: root.delegateClick() onPressAndHold: { haptics.buttonVibrate(); root.delegatePressAndHold(); } - + cursorShape: Qt.PointingHandCursor - + Kirigami.Icon { id: icon anchors.centerIn: parent