From 8982909fae61bd0eaf9bf9472c3ebe983011f3c7 Mon Sep 17 00:00:00 2001
From: Ly-sec <itslysec@gmail.com>
Date: Sun, 14 Sep 2025 13:45:17 +0200
Subject: [PATCH] Edit Style.qml so barHeight check for vertical bar
 SystemMonitor.qml: edit layout a little bit

---
 Commons/Style.qml                     |  4 +--
 Modules/Bar/Widgets/SystemMonitor.qml | 39 +++++++++++++--------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/Commons/Style.qml b/Commons/Style.qml
index 1a232ba..15497b6 100644
--- a/Commons/Style.qml
+++ b/Commons/Style.qml
@@ -66,9 +66,9 @@ Singleton {
   property int animationSlowest: Math.round(750 / Settings.data.general.animationSpeed)
 
   // Dimensions
-  property int barHeight: 36
+  property int barHeight: (Settings.data.bar.position === "left" || Settings.data.bar.position === "right") ? 40 : 36
   property int capsuleHeight: (barHeight * 0.73)
-  property int baseWidgetSize: 32
+  property int baseWidgetSize: (barHeight * 0.9)
   property int sliderWidth: 200
 
   // Delays
diff --git a/Modules/Bar/Widgets/SystemMonitor.qml b/Modules/Bar/Widgets/SystemMonitor.qml
index cb04187..c71b448 100644
--- a/Modules/Bar/Widgets/SystemMonitor.qml
+++ b/Modules/Bar/Widgets/SystemMonitor.qml
@@ -128,8 +128,7 @@ Item {
 
   Rectangle {
     id: backgroundContainer
-    anchors.left: parent.left
-    anchors.verticalCenter: parent.verticalCenter
+    anchors.centerIn: parent
     width: (barPosition === "left" || barPosition === "right") ? Math.round(Style.capsuleHeight * scaling) : (horizontalLayout.implicitWidth + Style.marginL * 2 * scaling)
     height: (barPosition === "left" || barPosition === "right") ? parent.height : Math.round(Style.capsuleHeight * scaling)
     radius: Math.round(Style.radiusM * scaling)
@@ -328,22 +327,22 @@ Item {
     ColumnLayout {
       id: verticalLayout
       anchors.centerIn: parent
-      width: Math.round(32 * scaling)
-      height: parent.height - Style.marginXS * scaling * 2
-      spacing: Style.marginXS * scaling
+      width: Math.round(28 * scaling)
+      height: parent.height
+      spacing: Style.marginXXS * scaling
       visible: barPosition === "left" || barPosition === "right"
 
       // CPU Usage Component
       Item {
         Layout.preferredHeight: Math.round(Style.capsuleHeight * scaling)
-        Layout.preferredWidth: Math.round(32 * scaling)
+        Layout.preferredWidth: Math.round(28 * scaling)
         Layout.alignment: Qt.AlignHCenter
         visible: showCpuUsage
 
         Column {
           id: cpuUsageRowVertical
           anchors.centerIn: parent
-          spacing: Style.marginXXS * scaling
+          spacing: 1 * scaling
 
           NIcon {
             icon: "cpu-usage"
@@ -352,7 +351,7 @@ Item {
           }
 
           NText {
-            text: `${SystemStatService.cpuUsage}%`
+            text: `${Math.round(SystemStatService.cpuUsage)}%`
             font.family: Settings.data.ui.fontFixed
             font.pointSize: Style.fontSizeXXS * scaling * 0.8
             font.weight: Style.fontWeightMedium
@@ -366,14 +365,14 @@ Item {
       // CPU Temperature Component
       Item {
         Layout.preferredHeight: Math.round(Style.capsuleHeight * scaling)
-        Layout.preferredWidth: Math.round(32 * scaling)
+        Layout.preferredWidth: Math.round(28 * scaling)
         Layout.alignment: Qt.AlignHCenter
         visible: showCpuTemp
 
         Column {
           id: cpuTempRowVertical
           anchors.centerIn: parent
-          spacing: Style.marginXXS * scaling
+          spacing: 1 * scaling
 
           NIcon {
             icon: "cpu-temperature"
@@ -383,7 +382,7 @@ Item {
           }
 
           NText {
-            text: `${SystemStatService.cpuTemp}°C`
+            text: `${SystemStatService.cpuTemp}°`
             font.family: Settings.data.ui.fontFixed
             font.pointSize: Style.fontSizeXXS * scaling * 0.8
             font.weight: Style.fontWeightMedium
@@ -397,14 +396,14 @@ Item {
       // Memory Usage Component
       Item {
         Layout.preferredHeight: Math.round(Style.capsuleHeight * scaling)
-        Layout.preferredWidth: Math.round(32 * scaling)
+        Layout.preferredWidth: Math.round(28 * scaling)
         Layout.alignment: Qt.AlignHCenter
         visible: showMemoryUsage
 
         Column {
           id: memoryUsageRowVertical
           anchors.centerIn: parent
-          spacing: Style.marginXXS * scaling
+          spacing: 1 * scaling
 
           NIcon {
             icon: "memory"
@@ -413,7 +412,7 @@ Item {
           }
 
           NText {
-            text: showMemoryAsPercent ? `${SystemStatService.memPercent}%` : `${SystemStatService.memGb}G`
+            text: showMemoryAsPercent ? `${SystemStatService.memPercent}%` : `${Math.round(SystemStatService.memGb)}G`
             font.family: Settings.data.ui.fontFixed
             font.pointSize: Style.fontSizeXXS * scaling * 0.8
             font.weight: Style.fontWeightMedium
@@ -427,14 +426,14 @@ Item {
       // Network Download Speed Component
       Item {
         Layout.preferredHeight: Math.round(Style.capsuleHeight * scaling)
-        Layout.preferredWidth: Math.round(32 * scaling)
+        Layout.preferredWidth: Math.round(28 * scaling)
         Layout.alignment: Qt.AlignHCenter
         visible: showNetworkStats
 
         Column {
           id: networkDownloadRowVertical
           anchors.centerIn: parent
-          spacing: Style.marginXXS * scaling
+          spacing: 1 * scaling
 
           NIcon {
             icon: "download-speed"
@@ -457,14 +456,14 @@ Item {
       // Network Upload Speed Component
       Item {
         Layout.preferredHeight: Math.round(Style.capsuleHeight * scaling)
-        Layout.preferredWidth: Math.round(32 * scaling)
+        Layout.preferredWidth: Math.round(28 * scaling)
         Layout.alignment: Qt.AlignHCenter
         visible: showNetworkStats
 
         Column {
           id: networkUploadRowVertical
           anchors.centerIn: parent
-          spacing: Style.marginXXS * scaling
+          spacing: 1 * scaling
 
           NIcon {
             icon: "upload-speed"
@@ -487,14 +486,14 @@ Item {
       // Disk Usage Component (primary drive)
       Item {
         Layout.preferredHeight: Math.round(Style.capsuleHeight * scaling)
-        Layout.preferredWidth: Math.round(32 * scaling)
+        Layout.preferredWidth: Math.round(28 * scaling)
         Layout.alignment: Qt.AlignHCenter
         visible: showDiskUsage
 
         ColumnLayout {
           id: diskUsageRowVertical
           anchors.centerIn: parent
-          spacing: Style.marginXXS * scaling
+          spacing: 1 * scaling
 
           NIcon {
             icon: "storage"