From d11a8fc3119e00b99f0632e0f308bb324e115ded Mon Sep 17 00:00:00 2001
From: loner <2788892716@qq.com>
Date: Thu, 16 Oct 2025 09:53:00 +0800
Subject: [PATCH] feat(bar): Adapt ActiveWindow to bar density scaling

---
 Modules/Bar/Widgets/ActiveWindow.qml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Modules/Bar/Widgets/ActiveWindow.qml b/Modules/Bar/Widgets/ActiveWindow.qml
index 745f69b5..79670824 100644
--- a/Modules/Bar/Widgets/ActiveWindow.qml
+++ b/Modules/Bar/Widgets/ActiveWindow.qml
@@ -18,6 +18,7 @@ Item {
   property string section: ""
   property int sectionWidgetIndex: -1
   property int sectionWidgetsCount: 0
+  property real scaling: 1.0
 
   property var widgetMetadata: BarWidgetRegistry.widgetMetadata[widgetId]
   property var widgetSettings: {
@@ -55,8 +56,7 @@ Item {
   }
 
   function calculatedVerticalDimension() {
-    const ratio = (Settings.data.bar.density === "mini") ? 0.67 : 0.8
-    return Math.round(Style.baseWidgetSize * ratio)
+    return Math.round((Style.baseWidgetSize - 5) * scaling)
   }
 
   function getAppIcon() {
@@ -107,7 +107,7 @@ Item {
     id: fullTitleMetrics
     visible: false
     text: windowTitle
-    pointSize: Style.fontSizeS
+    pointSize: Style.fontSizeS * scaling
     applyUiScale: false
     font.weight: Style.fontWeightMedium
   }
@@ -125,21 +125,21 @@ Item {
     Item {
       id: mainContainer
       anchors.fill: parent
-      anchors.leftMargin: isVerticalBar ? 0 : Style.marginS
-      anchors.rightMargin: isVerticalBar ? 0 : Style.marginS
+      anchors.leftMargin: isVerticalBar ? 0 : Style.marginS * scaling
+      anchors.rightMargin: isVerticalBar ? 0 : Style.marginS * scaling
 
       // Horizontal layout for top/bottom bars
       RowLayout {
         id: rowLayout
         anchors.verticalCenter: parent.verticalCenter
-        spacing: Style.marginS
+        spacing: Style.marginS * scaling
         visible: !isVerticalBar
         z: 1
 
         // Window icon
         Item {
-          Layout.preferredWidth: 18
-          Layout.preferredHeight: 18
+          Layout.preferredWidth: 18 * scaling
+          Layout.preferredHeight: 18 * scaling
           Layout.alignment: Qt.AlignVCenter
           visible: showIcon
 
@@ -254,7 +254,7 @@ Item {
               NText {
                 id: titleText
                 text: windowTitle
-                pointSize: Style.fontSizeS
+                pointSize: Style.fontSizeS * scaling
                 applyUiScale: false
                 font.weight: Style.fontWeightMedium
                 verticalAlignment: Text.AlignVCenter
@@ -265,7 +265,7 @@ Item {
               NText {
                 text: windowTitle
                 font: titleText.font
-                pointSize: Style.fontSizeS
+                pointSize: Style.fontSizeS * scaling
                 applyUiScale: false
                 verticalAlignment: Text.AlignVCenter
                 color: Color.mOnSurface
@@ -316,7 +316,7 @@ Item {
 
         // Window icon
         Item {
-          width: Style.baseWidgetSize * 0.5
+          width: Style.baseWidgetSize * 0.5 * scaling
           height: width
           anchors.centerIn: parent
           visible: windowTitle !== ""