diff --git a/Drawers/Backgrounds.qml b/Drawers/Backgrounds.qml deleted file mode 100644 index 6593cbe..0000000 --- a/Drawers/Backgrounds.qml +++ /dev/null @@ -1,107 +0,0 @@ -import Quickshell -import QtQuick -import QtQuick.Shapes -import qs.Components -import qs.Config -import qs.Modules as Modules -import qs.Modules.Notifications as Notifications -import qs.Modules.Notifications.Sidebar as Sidebar -import qs.Modules.Notifications.Sidebar.Utils as Utils -import qs.Modules.Dashboard as Dashboard -import qs.Modules.Osd as Osd -import qs.Modules.Launcher as Launcher -import qs.Modules.Resources as Resources -import qs.Modules.Drawing as Drawing -import qs.Modules.Settings as Settings -import qs.Modules.Dock as Dock - -Shape { - id: root - - required property Item bar - required property Panels panels - required property PersistentProperties visibilities - - anchors.fill: parent - anchors.margins: Config.barConfig.border - anchors.topMargin: bar.implicitHeight - asynchronous: true - preferredRendererType: Shape.CurveRenderer - - Drawing.Background { - startX: 0 - startY: wrapper.y - rounding - wrapper: root.panels.drawing - } - - Resources.Background { - startX: 0 - rounding - startY: 0 - wrapper: root.panels.resources - } - - Osd.Background { - startX: root.width - root.panels.sidebar.width - startY: (root.height - wrapper.height) / 2 - rounding - wrapper: root.panels.osd - } - - Modules.Background { - invertBottomRounding: wrapper.x <= 0 - rounding: root.panels.popouts.currentName.startsWith("updates") || root.panels.popouts.currentName.startsWith("audio") ? Appearance.rounding.normal : Appearance.rounding.smallest - startX: wrapper.x - rounding - startY: wrapper.y - wrapper: root.panels.popouts - } - - Notifications.Background { - sidebar: sidebar - startX: root.width - startY: 0 - wrapper: root.panels.notifications - } - - Launcher.Background { - startX: (root.width - wrapper.width) / 2 - rounding - startY: root.height - wrapper: root.panels.launcher - } - - Dashboard.Background { - startX: root.width - root.panels.dashboard.width - rounding - startY: 0 - wrapper: root.panels.dashboard - } - - Utils.Background { - sidebar: sidebar - startX: root.width - startY: root.height - wrapper: root.panels.utilities - } - - Sidebar.Background { - id: sidebar - - panels: root.panels - startX: root.width - startY: root.panels.notifications.height - wrapper: root.panels.sidebar - } - - Settings.Background { - id: settings - - startX: (root.width - wrapper.width) / 2 - rounding - startY: 0 - wrapper: root.panels.settings - } - - Dock.Background { - id: dock - - startX: (root.width - wrapper.width) / 2 - rounding - startY: root.height - wrapper: root.panels.dock - } -} diff --git a/Modules/Background.qml b/Modules/Background.qml deleted file mode 100644 index a726d17..0000000 --- a/Modules/Background.qml +++ /dev/null @@ -1,68 +0,0 @@ -import QtQuick -import QtQuick.Shapes -import qs.Components -import qs.Config - -ShapePath { - id: root - - readonly property bool flatten: wrapper.height < rounding * 2 - property real ibr: invertBottomRounding ? -1 : 1 - required property bool invertBottomRounding - property real rounding: Appearance.rounding.smallest - readonly property real roundingY: flatten ? wrapper.height / 2 : rounding - required property Wrapper wrapper - - fillColor: DynamicColors.palette.m3surface - strokeWidth: -1 - - Behavior on fillColor { - CAnim { - } - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: root.roundingY - } - - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.roundingY - root.roundingY * root.ibr - } - - PathArc { - direction: root.invertBottomRounding ? PathArc.Clockwise : PathArc.Counterclockwise - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: root.roundingY * root.ibr - } - - PathLine { - relativeX: root.wrapper.width - root.rounding * 2 - relativeY: 0 - } - - PathArc { - direction: PathArc.Counterclockwise - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: -root.roundingY - } - - PathLine { - relativeX: 0 - relativeY: -(root.wrapper.height - root.roundingY * 2) - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: -root.roundingY - } -} diff --git a/Modules/Dashboard/Background.qml b/Modules/Dashboard/Background.qml deleted file mode 100644 index cf42103..0000000 --- a/Modules/Dashboard/Background.qml +++ /dev/null @@ -1,65 +0,0 @@ -import qs.Components -import qs.Config -import QtQuick -import QtQuick.Shapes - -ShapePath { - id: root - - readonly property bool flatten: wrapper.height < rounding * 2 - readonly property real rounding: Appearance.rounding.normal - readonly property real roundingY: flatten ? wrapper.height / 2 : rounding - required property Wrapper wrapper - - fillColor: DynamicColors.palette.m3surface - strokeWidth: -1 - - Behavior on fillColor { - CAnim { - } - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: root.roundingY - } - - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.roundingY * 2 - } - - PathArc { - direction: PathArc.Counterclockwise - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: root.roundingY - } - - PathLine { - relativeX: root.wrapper.width - root.rounding * 2 - relativeY: 0 - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: root.roundingY - } - - PathLine { - relativeX: 0 - relativeY: -(root.wrapper.height) - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: -root.roundingY - } -} diff --git a/Modules/Dock/Background.qml b/Modules/Dock/Background.qml deleted file mode 100644 index 37f8c08..0000000 --- a/Modules/Dock/Background.qml +++ /dev/null @@ -1,66 +0,0 @@ -import QtQuick -import QtQuick.Shapes -import qs.Components -import qs.Config - -ShapePath { - id: root - - readonly property bool flatten: wrapper.height < rounding * 2 - readonly property real rounding: Appearance.rounding.normal - readonly property real roundingY: flatten ? wrapper.height / 2 : rounding - required property Wrapper wrapper - - fillColor: DynamicColors.palette.m3surface - strokeWidth: -1 - - Behavior on fillColor { - CAnim { - } - } - - PathArc { - direction: PathArc.Counterclockwise - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: -root.roundingY - } - - PathLine { - relativeX: 0 - relativeY: -(root.wrapper.height - root.roundingY * 2) - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: -root.roundingY - } - - PathLine { - relativeX: root.wrapper.width - root.rounding * 2 - relativeY: 0 - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: root.roundingY - } - - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.roundingY * 2 - } - - PathArc { - direction: PathArc.Counterclockwise - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: root.roundingY - } -} diff --git a/Modules/Drawing/Background.qml b/Modules/Drawing/Background.qml deleted file mode 100644 index f19ba9a..0000000 --- a/Modules/Drawing/Background.qml +++ /dev/null @@ -1,66 +0,0 @@ -import QtQuick -import QtQuick.Shapes -import qs.Components -import qs.Config - -ShapePath { - id: root - - readonly property bool flatten: wrapper.width < rounding * 2 - readonly property real rounding: Appearance.rounding.normal - readonly property real roundingX: flatten ? wrapper.width / 2 : rounding - required property Wrapper wrapper - - fillColor: DynamicColors.palette.m3surface - strokeWidth: -1 - - Behavior on fillColor { - CAnim { - } - } - - PathArc { - direction: PathArc.Counterclockwise - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - relativeX: root.roundingX - relativeY: root.rounding - } - - PathLine { - relativeX: root.wrapper.width - root.roundingX * 2 - relativeY: 0 - } - - PathArc { - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - relativeX: root.roundingX - relativeY: root.rounding - } - - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.rounding * 2 - } - - PathArc { - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - relativeX: -root.roundingX - relativeY: root.rounding - } - - PathLine { - relativeX: -(root.wrapper.width - root.roundingX * 2) - relativeY: 0 - } - - PathArc { - direction: PathArc.Counterclockwise - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - relativeX: -root.roundingX - relativeY: root.rounding - } -} diff --git a/Modules/Launcher/Background.qml b/Modules/Launcher/Background.qml deleted file mode 100644 index cb795d4..0000000 --- a/Modules/Launcher/Background.qml +++ /dev/null @@ -1,66 +0,0 @@ -import QtQuick -import QtQuick.Shapes -import qs.Components -import qs.Config - -ShapePath { - id: root - - readonly property bool flatten: wrapper.height < rounding * 2 - readonly property real rounding: Appearance.rounding.smallest + 5 - readonly property real roundingY: flatten ? wrapper.height / 2 : rounding - required property Wrapper wrapper - - fillColor: DynamicColors.palette.m3surface - strokeWidth: -1 - - Behavior on fillColor { - CAnim { - } - } - - PathArc { - direction: PathArc.Counterclockwise - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: -root.roundingY - } - - PathLine { - relativeX: 0 - relativeY: -(root.wrapper.height - root.roundingY * 2) - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: -root.roundingY - } - - PathLine { - relativeX: root.wrapper.width - root.rounding * 2 - relativeY: 0 - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: root.roundingY - } - - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.roundingY * 2 - } - - PathArc { - direction: PathArc.Counterclockwise - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: root.roundingY - } -} diff --git a/Modules/Notifications/Background.qml b/Modules/Notifications/Background.qml deleted file mode 100644 index 9e68e20..0000000 --- a/Modules/Notifications/Background.qml +++ /dev/null @@ -1,59 +0,0 @@ -import qs.Components -import qs.Config -import QtQuick -import QtQuick.Shapes - -ShapePath { - id: root - - readonly property bool flatten: wrapper.height < rounding * 2 - readonly property real rounding: 8 - readonly property real roundingY: flatten ? wrapper.height / 2 : rounding - required property var sidebar - required property Wrapper wrapper - - fillColor: DynamicColors.palette.m3surface - strokeWidth: -1 - - Behavior on fillColor { - CAnim { - } - } - - PathLine { - relativeX: -(root.wrapper.width + root.rounding) - relativeY: 0 - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: root.roundingY - } - - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.roundingY * 2 - } - - PathArc { - direction: PathArc.Counterclockwise - radiusX: root.sidebar.notifsRoundingX - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.sidebar.notifsRoundingX - relativeY: root.roundingY - } - - PathLine { - relativeX: root.wrapper.height > 0 ? root.wrapper.width - root.rounding - root.sidebar.notifsRoundingX : root.wrapper.width - relativeY: 0 - } - - PathArc { - radiusX: root.rounding - radiusY: root.rounding - relativeX: root.rounding - relativeY: root.rounding - } -} diff --git a/Modules/Notifications/Sidebar/Background.qml b/Modules/Notifications/Sidebar/Background.qml deleted file mode 100644 index f31c43d..0000000 --- a/Modules/Notifications/Sidebar/Background.qml +++ /dev/null @@ -1,54 +0,0 @@ -import QtQuick -import QtQuick.Shapes -import qs.Components -import qs.Config - -ShapePath { - id: root - - readonly property bool flatten: wrapper.width < rounding * 2 - readonly property real notifsRoundingX: panels.notifications.height > 0 && notifsWidthDiff < rounding * 2 ? notifsWidthDiff / 2 : rounding - readonly property real notifsWidthDiff: panels.notifications.width - wrapper.width - required property var panels - readonly property real rounding: Config.barConfig.rounding - readonly property real utilsRoundingX: utilsWidthDiff < rounding * 2 ? utilsWidthDiff / 2 : rounding - readonly property real utilsWidthDiff: panels.utilities.width - wrapper.width - required property Wrapper wrapper - - fillColor: DynamicColors.palette.m3surface - strokeWidth: -1 - - Behavior on fillColor { - CAnim { - } - } - - PathLine { - relativeX: -root.wrapper.width - root.notifsRoundingX - relativeY: 0 - } - - PathArc { - radiusX: root.notifsRoundingX - radiusY: root.rounding - relativeX: root.notifsRoundingX - relativeY: root.rounding - } - - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.rounding * 2 - } - - PathArc { - radiusX: root.utilsRoundingX - radiusY: root.rounding - relativeX: -root.utilsRoundingX - relativeY: root.rounding - } - - PathLine { - relativeX: root.wrapper.width + root.utilsRoundingX - relativeY: 0 - } -} diff --git a/Modules/Osd/Background.qml b/Modules/Osd/Background.qml deleted file mode 100644 index 441dad3..0000000 --- a/Modules/Osd/Background.qml +++ /dev/null @@ -1,66 +0,0 @@ -import QtQuick -import QtQuick.Shapes -import qs.Components -import qs.Config - -ShapePath { - id: root - - readonly property bool flatten: wrapper.width < rounding * 2 - readonly property real rounding: 10 - readonly property real roundingX: flatten ? wrapper.width / 2 : rounding - required property Wrapper wrapper - - fillColor: DynamicColors.palette.m3surface - strokeWidth: -1 - - Behavior on fillColor { - CAnim { - } - } - - PathArc { - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - relativeX: -root.roundingX - relativeY: root.rounding - } - - PathLine { - relativeX: -(root.wrapper.width - root.roundingX * 3) - relativeY: 0 - } - - PathArc { - direction: PathArc.Counterclockwise - radiusX: Math.min(root.rounding * 2, root.wrapper.width) - radiusY: root.rounding * 2 - relativeX: -root.roundingX * 2 - relativeY: root.rounding * 2 - } - - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.rounding * 4 - } - - PathArc { - direction: PathArc.Counterclockwise - radiusX: Math.min(root.rounding * 2, root.wrapper.width) - radiusY: root.rounding * 2 - relativeX: root.roundingX * 2 - relativeY: root.rounding * 2 - } - - PathLine { - relativeX: root.wrapper.width - root.roundingX * 3 - relativeY: 0 - } - - PathArc { - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - relativeX: root.roundingX - relativeY: root.rounding - } -} diff --git a/Modules/Resources/Background.qml b/Modules/Resources/Background.qml deleted file mode 100644 index 48a7eb8..0000000 --- a/Modules/Resources/Background.qml +++ /dev/null @@ -1,65 +0,0 @@ -import qs.Components -import qs.Config -import QtQuick -import QtQuick.Shapes - -ShapePath { - id: root - - readonly property bool flatten: wrapper.height < rounding * 2 - readonly property real rounding: Appearance.rounding.normal - readonly property real roundingY: flatten ? wrapper.height / 2 : rounding - required property Wrapper wrapper - - fillColor: DynamicColors.palette.m3surface - strokeWidth: -1 - - Behavior on fillColor { - CAnim { - } - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: root.roundingY - } - - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: -root.roundingY - } - - PathLine { - relativeX: root.wrapper.width - root.rounding * 2 - relativeY: 0 - } - - PathArc { - direction: PathArc.Counterclockwise - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: -root.roundingY - } - - PathLine { - relativeX: 0 - relativeY: -(root.wrapper.height - root.roundingY * 2) - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: -root.roundingY - } -} diff --git a/Modules/Settings/Background.qml b/Modules/Settings/Background.qml deleted file mode 100644 index 3004b3d..0000000 --- a/Modules/Settings/Background.qml +++ /dev/null @@ -1,66 +0,0 @@ -import QtQuick -import QtQuick.Shapes -import qs.Components -import qs.Config - -ShapePath { - id: root - - readonly property bool flatten: wrapper.height < rounding * 2 - readonly property real rounding: Appearance.rounding.large - readonly property real roundingY: flatten ? wrapper.height / 2 : rounding - required property Wrapper wrapper - - fillColor: DynamicColors.palette.m3surface - strokeWidth: -1 - - Behavior on fillColor { - CAnim { - } - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.roundingY, root.wrapper.height) - relativeX: root.rounding - relativeY: root.roundingY - } - - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.roundingY * 2 - } - - PathArc { - direction: PathArc.Counterclockwise - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: root.roundingY - } - - PathLine { - relativeX: root.wrapper.width - root.rounding * 2 - relativeY: 0 - } - - PathArc { - direction: PathArc.Counterclockwise - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: -root.roundingY - } - - PathLine { - relativeX: 0 - relativeY: -(root.wrapper.height - root.roundingY * 2) - } - - PathArc { - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - relativeX: root.rounding - relativeY: -root.roundingY - } -}