panel window

components/StyledRectangle.qml

@@ -1,12 +1,9 @@
 import qs.config
 import QtQuick
-import Quickshell.Widgets
 
-WrapperRectangle {
+Rectangle {
-    id: root
-    margin: 8
     radius: Styling.theme.radiusBox
-    color: Styling.theme.base200
+    color: Styling.theme.base100
     Behavior on color {
         ColorAnimation {
             duration: Styling.animations.speed.normal

components/StyledWrapperRectangle.qml

@@ -3,6 +3,7 @@ import QtQuick
 import Quickshell.Widgets
 
 WrapperRectangle {
+    margin: 8
     radius: Styling.theme.radiusBox
     color: Styling.theme.base100
     Behavior on color {

modules/bar/Bar.qml

@@ -22,6 +22,7 @@ StyledWrapperRectangle {
     border.color: Styling.theme.base200
 
     margin: 4
+    color: Styling.theme.base100
 
     RowLayout {
 

modules/bar/components/Clock.qml

@@ -1,12 +1,10 @@
 import qs.components
 import Quickshell
 
-StyledRectangle {
+StyledText {
-    StyledText {
     text: ` ${Qt.formatDateTime(clock.date, "hh:mm:ss AP")}`
     SystemClock {
         id: clock
         precision: SystemClock.Seconds
     }
-    }
 }

modules/bar/components/Memory.qml

@@ -5,9 +5,7 @@ import qs.utils
 import QtQuick
 import QtQuick.Layouts
 
-StyledRectangle {
+RowLayout {
-
-    RowLayout {
 
     Ref {
         service: SystemInfo
@@ -20,5 +18,4 @@ StyledRectangle {
     StyledText {
         text: ` ${(SystemInfo.memPerc * 100).toFixed()}%`
     }
-    }
 }

modules/bar/components/Network.qml

@@ -5,9 +5,7 @@ import qs.utils
 import QtQuick
 import QtQuick.Layouts
 
-StyledRectangle {
+RowLayout {
-
-    RowLayout {
 
     Ref {
         service: NetworkService
@@ -51,5 +49,4 @@ StyledRectangle {
         id: text
         text: ` ${(NetworkService.active?.strength ?? 0).toFixed()}%`
     }
-    }
 }

modules/bar/components/Storage.qml

@@ -5,9 +5,7 @@ import qs.utils
 import QtQuick
 import QtQuick.Layouts
 
-StyledRectangle {
+RowLayout {
-
-    RowLayout {
 
     Ref {
         service: SystemInfo
@@ -22,5 +20,4 @@ StyledRectangle {
 
         text: ` ${(SystemInfo.storagePerc * 100).toFixed()}%`
     }
-    }
 }

modules/bar/components/bluetooth/AvailableDevice.qml

@@ -1,20 +1,21 @@
 pragma ComponentBehavior: Bound
 
 import qs.components
+import qs.config
 import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import Quickshell.Bluetooth
 import Quickshell.Widgets
 
-StyledRectangle {
+StyledWrapperRectangle {
     id: root
     required property BluetoothDevice modelData
 
     RowLayout {
         id: row
 
-        spacing: 8
+        spacing: Styling.layout.spacing.base
 
         Loader {
             active: root.modelData?.icon != undefined

modules/bar/components/bluetooth/ConnectedDevice.qml

@@ -8,14 +8,14 @@ import Quickshell
 import Quickshell.Bluetooth
 import Quickshell.Widgets
 
-StyledRectangle {
+StyledWrapperRectangle {
     id: root
     required property BluetoothDevice modelData
 
     RowLayout {
         id: row
 
-        spacing: 8
+        spacing: Styling.layout.spacing.base
 
         Loader {
             active: root.modelData?.icon != undefined

modules/bar/components/bluetooth/PairedDevice.qml

@@ -2,21 +2,20 @@ pragma ComponentBehavior: Bound
 
 import qs.components
 import qs.config
-import qs.widgets
 import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import Quickshell.Bluetooth
 import Quickshell.Widgets
 
-StyledRectangle {
+StyledWrapperRectangle {
     id: root
     required property BluetoothDevice modelData
 
     RowLayout {
         id: row
 
-        spacing: 8
+        spacing: Styling.layout.spacing.base
 
         Loader {
             active: root.modelData?.icon != undefined

modules/bar/components/notifications/NotificationItem.qml

@@ -1,18 +1,16 @@
 pragma ComponentBehavior: Bound
 
 import qs.components
-import qs.widgets
 import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import Quickshell.Widgets
 
-StyledRectangle {
+StyledWrapperRectangle {
     id: root
 
     required property var modelData
 
-    margin: 16
     anchors.left: parent.left
     anchors.right: parent.right
 

modules/bar/components/notifications/NotificationMenu.qml

@@ -1,7 +1,6 @@
 pragma ComponentBehavior: Bound
 
 import qs.components
-import qs.config
 import qs.services
 import QtQuick
 import QtQuick.Layouts
@@ -25,9 +24,8 @@ StyledPopupWindow {
             onClicked: Notifications.clear()
         }
 
-        StyledRectangle {
+        StyledWrapperRectangle {
             Layout.columnSpan: 2
-            color: Styling.theme.base200
             StyledListView {
                 id: notifications
 

modules/launcher/Launcher.qml

@@ -9,7 +9,7 @@ import Quickshell.Wayland
 import QtQuick
 import QtQuick.Layouts
 
-StyledWindow {
+StyledPanelWindow {
     id: root
     name: "launcher"
 

modules/pomodoro/Pomodoro.qml

@@ -9,7 +9,7 @@ import Quickshell.Wayland
 import QtQuick
 import QtQuick.Layouts
 
-StyledWindow {
+StyledPanelWindow {
     id: root
     name: "pomodoro"
 

modules/powermenu/PowerMenu.qml

@@ -9,7 +9,7 @@ import Quickshell.Wayland
 import QtQuick
 import QtQuick.Layouts
 
-StyledWindow {
+StyledPanelWindow {
     id: root
     name: "powermenu"
 

modules/storybook/Storybook.qml

@@ -9,7 +9,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
-StyledWindow {
+StyledPanelWindow {
     id: root
     name: "storybook"