From 95fae6e945bbb0d2f2627f20e92dc5dd5e175d10 Mon Sep 17 00:00:00 2001
From: cutefishd <cutefishos@foxmail.com>
Date: Tue, 13 Apr 2021 22:28:18 +0800
Subject: [PATCH] HiDPI spacing optimization

---
 qml/main.qml      | 6 +++---
 src/statusbar.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qml/main.qml b/qml/main.qml
index bcb08b1..139f10c 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -45,7 +45,7 @@ Item {
         anchors.fill: parent
         anchors.leftMargin: FishUI.Units.smallSpacing
         anchors.rightMargin: FishUI.Units.smallSpacing
-        spacing: 0
+        spacing: FishUI.Units.smallSpacing
 
         StandardItem {
             id: acticityItem
@@ -91,13 +91,13 @@ Item {
             layoutDirection: Qt.RightToLeft
             interactive: false
             clip: true
-            spacing: 0
+            spacing: FishUI.Units.smallSpacing
 
             property var itemSize: rootItem.height * 0.8
             property var itemWidth: itemSize + FishUI.Units.smallSpacing
 
             Layout.fillHeight: true
-            Layout.preferredWidth: itemWidth * count
+            Layout.preferredWidth: (itemWidth + (count - 1) * FishUI.Units.smallSpacing) * count
 
             model: SystemTrayModel {
                 id: trayModel
diff --git a/src/statusbar.cpp b/src/statusbar.cpp
index 3ca6c97..9e0e5b4 100644
--- a/src/statusbar.cpp
+++ b/src/statusbar.cpp
@@ -57,7 +57,7 @@ StatusBar::StatusBar(QQuickView *parent)
 void StatusBar::updateGeometry()
 {
     const QRect rect = qApp->primaryScreen()->geometry();
-    QRect windowRect = QRect(rect.x(), rect.y(), rect.width(), 28 * qApp->devicePixelRatio());
+    QRect windowRect = QRect(rect.x(), rect.y(), rect.width(), 26 * qApp->devicePixelRatio());
     setGeometry(windowRect);
     updateViewStruts();