Bar SysMon: converted to Layout

Modules/Bar/Widgets/SystemMonitor.qml

@@ -1,46 +1,44 @@
 import QtQuick
+import QtQuick.Layouts
 import Quickshell
 import qs.Commons
 import qs.Services
 import qs.Widgets
 
-Row {
+RowLayout {
   id: root
 
   property ShellScreen screen
   property real scaling: 1.0
 
-  anchors.verticalCenter: parent.verticalCenter
+  Layout.alignment: Qt.AlignVCenter
   spacing: Style.marginS * scaling
 
   Rectangle {
-    // Let the Rectangle size itself based on its content (the Row)
+    Layout.preferredHeight: Math.round(Style.capsuleHeight * scaling)
-    width: row.width + Style.marginM * scaling * 2
+    Layout.preferredWidth: mainLayout.implicitWidth + Style.marginM * scaling * 2
+    Layout.alignment: Qt.AlignVCenter
 
-    height: Math.round(Style.capsuleHeight * scaling)
     radius: Math.round(Style.radiusM * scaling)
     color: Color.mSurfaceVariant
 
-    anchors.verticalCenter: parent.verticalCenter
+    RowLayout {
-
+      id: mainLayout
-    Item {
-      id: mainContainer
       anchors.fill: parent
       anchors.leftMargin: Style.marginS * scaling
       anchors.rightMargin: Style.marginS * scaling
-
-      Row {
-        id: row
-        anchors.verticalCenter: parent.verticalCenter
       spacing: Style.marginS * scaling
-        Row {
+
+      // CPU Usage Component
+      RowLayout {
         id: cpuUsageLayout
         spacing: Style.marginXS * scaling
+        Layout.alignment: Qt.AlignVCenter
 
         NIcon {
           id: cpuUsageIcon
           text: "speed"
-            anchors.verticalCenter: parent.verticalCenter
+          Layout.alignment: Qt.AlignVCenter
         }
 
         NText {
@@ -49,21 +47,22 @@ Row {
           font.family: Settings.data.ui.fontFixed
           font.pointSize: Style.fontSizeS * scaling
           font.weight: Style.fontWeightMedium
-            anchors.verticalCenter: parent.verticalCenter
+          Layout.alignment: Qt.AlignVCenter
           verticalAlignment: Text.AlignVCenter
           color: Color.mPrimary
         }
       }
 
       // CPU Temperature Component
-        Row {
+      RowLayout {
         id: cpuTempLayout
         // spacing is thin here to compensate for the vertical thermometer icon
         spacing: Style.marginXXS * scaling
+        Layout.alignment: Qt.AlignVCenter
 
         NIcon {
           text: "thermometer"
-            anchors.verticalCenter: parent.verticalCenter
+          Layout.alignment: Qt.AlignVCenter
         }
 
         NText {
@@ -71,20 +70,21 @@ Row {
           font.family: Settings.data.ui.fontFixed
           font.pointSize: Style.fontSizeS * scaling
           font.weight: Style.fontWeightMedium
-            anchors.verticalCenter: parent.verticalCenter
+          Layout.alignment: Qt.AlignVCenter
           verticalAlignment: Text.AlignVCenter
           color: Color.mPrimary
         }
       }
 
       // Memory Usage Component
-        Row {
+      RowLayout {
         id: memoryUsageLayout
         spacing: Style.marginXS * scaling
+        Layout.alignment: Qt.AlignVCenter
 
         NIcon {
           text: "memory"
-            anchors.verticalCenter: parent.verticalCenter
+          Layout.alignment: Qt.AlignVCenter
         }
 
         NText {
@@ -92,21 +92,22 @@ Row {
           font.family: Settings.data.ui.fontFixed
           font.pointSize: Style.fontSizeS * scaling
           font.weight: Style.fontWeightMedium
-            anchors.verticalCenter: parent.verticalCenter
+          Layout.alignment: Qt.AlignVCenter
           verticalAlignment: Text.AlignVCenter
           color: Color.mPrimary
         }
       }
 
       // Network Download Speed Component
-        Row {
+      RowLayout {
         id: networkDownloadLayout
         spacing: Style.marginXS * scaling
+        Layout.alignment: Qt.AlignVCenter
         visible: Settings.data.bar.showNetworkStats
 
         NIcon {
           text: "download"
-            anchors.verticalCenter: parent.verticalCenter
+          Layout.alignment: Qt.AlignVCenter
         }
 
         NText {
@@ -114,21 +115,22 @@ Row {
           font.family: Settings.data.ui.fontFixed
           font.pointSize: Style.fontSizeS * scaling
           font.weight: Style.fontWeightMedium
-            anchors.verticalCenter: parent.verticalCenter
+          Layout.alignment: Qt.AlignVCenter
           verticalAlignment: Text.AlignVCenter
           color: Color.mPrimary
         }
       }
 
       // Network Upload Speed Component
-        Row {
+      RowLayout {
         id: networkUploadLayout
         spacing: Style.marginXS * scaling
+        Layout.alignment: Qt.AlignVCenter
         visible: Settings.data.bar.showNetworkStats
 
         NIcon {
           text: "upload"
-            anchors.verticalCenter: parent.verticalCenter
+          Layout.alignment: Qt.AlignVCenter
         }
 
         NText {
@@ -136,12 +138,11 @@ Row {
           font.family: Settings.data.ui.fontFixed
           font.pointSize: Style.fontSizeS * scaling
           font.weight: Style.fontWeightMedium
-            anchors.verticalCenter: parent.verticalCenter
+          Layout.alignment: Qt.AlignVCenter
           verticalAlignment: Text.AlignVCenter
           color: Color.mPrimary
         }
       }
     }
   }
-  }
 }

Services/SystemStatService.qml

@@ -22,7 +22,7 @@ Singleton {
     if (bytesPerSecond < 1024) {
       return bytesPerSecond.toFixed(0) + "B/s"
     } else if (bytesPerSecond < 1024 * 1024) {
-      return (bytesPerSecond / 1024).toFixed(1) + "KB/s"
+      return (bytesPerSecond / 1024).toFixed(0) + "KB/s"
     } else if (bytesPerSecond < 1024 * 1024 * 1024) {
       return (bytesPerSecond / (1024 * 1024)).toFixed(1) + "MB/s"
     } else {