From 29f1ce6b3d932e6a7981aa8f753ad64cbf255db5 Mon Sep 17 00:00:00 2001
From: ferreo <harderthanfire@gmail.com>
Date: Sat, 23 Nov 2024 01:34:31 +0000
Subject: [PATCH] Refactor Topbar and ActiveWindow layouts: enhance flexibility
 by removing width constraints and centering items appropriately

---
 pikabar/usr/share/pikabar/Topbar.qml          |  5 +----
 .../share/pikabar/widgets/ActiveWindow.qml    | 21 +++++--------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/pikabar/usr/share/pikabar/Topbar.qml b/pikabar/usr/share/pikabar/Topbar.qml
index 52b5b66..79cc53f 100644
--- a/pikabar/usr/share/pikabar/Topbar.qml
+++ b/pikabar/usr/share/pikabar/Topbar.qml
@@ -66,13 +66,10 @@ PanelWindow {
                 Layout.fillHeight: true
 
                 RowLayout {
-                    anchors.centerIn: parent
-                    width: parent.width
+                    anchors.fill: parent
 
                     Widgets.ActiveWindow {
                         Layout.fillWidth: true
-                        maxWidth: panel.width / 3
-                        Layout.maximumWidth: parent.width
                     }
                 }
             }
diff --git a/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml b/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml
index 4d1990c..88a5bb2 100644
--- a/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml
+++ b/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml
@@ -7,8 +7,6 @@ import "root:/"
 
 BarWidget {
     id: wrapper
-    property int maxWidth: 100
-    Layout.fillWidth: true
 
     function getIcon() {
         var icon = Quickshell.iconPath(ToplevelManager.activeToplevel.appId.toLowerCase(), true);
@@ -26,26 +24,22 @@ BarWidget {
     }
 
     RowLayout {
-        width: parent.width
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: Math.min(implicitWidth, parent.width)
         height: parent.height
         spacing: 4
 
-        Item {
-            Layout.fillWidth: true
-            Layout.preferredWidth: parent.width / 2
-        }
-
         IconImage {
             id: icon
             implicitHeight: 20
             implicitWidth: 20
-            source: ToplevelManager.activeToplevel ? getIcon() : "" 
+            source: ToplevelManager.activeToplevel ? getIcon() : ""
         }
 
         Text {
             id: text
-            Layout.fillWidth: false
-            Layout.maximumWidth: wrapper.maxWidth - icon.implicitWidth - 32
+            Layout.fillWidth: true
+            Layout.maximumWidth: implicitWidth + 1
             horizontalAlignment: Text.AlignLeft
             text: ToplevelManager.activeToplevel?.title ?? ""
             color: Globals.commonStyles.textColor
@@ -55,10 +49,5 @@ BarWidget {
             elide: Text.ElideRight
             maximumLineCount: 1
         }
-
-        Item {
-            Layout.fillWidth: true
-            Layout.preferredWidth: parent.width / 2
-        }
     }
 }