From e05e6d5c4659f08d388e4aa3ebe9fd1357964f35 Mon Sep 17 00:00:00 2001
From: ferreo <harderthanfire@gmail.com>
Date: Sun, 17 Nov 2024 19:34:26 +0000
Subject: [PATCH] Refactor ActiveWindow and replace WidgetText with Text;
 updated changelog for v1.0.0-101pika4 and adjusted UI elements

---
 .github/release-nest-v3                       |  2 +-
 pikabar/debian/changelog                      |  2 +-
 .../share/pikabar/widgets/ActiveWindow.qml    | 18 ++++++++++++++----
 .../usr/share/pikabar/widgets/WidgetText.qml  | 19 -------------------
 4 files changed, 16 insertions(+), 25 deletions(-)
 delete mode 100644 pikabar/usr/share/pikabar/widgets/WidgetText.qml

diff --git a/.github/release-nest-v3 b/.github/release-nest-v3
index d8263ee..56a6051 100644
--- a/.github/release-nest-v3
+++ b/.github/release-nest-v3
@@ -1 +1 @@
-2
\ No newline at end of file
+1
\ No newline at end of file
diff --git a/pikabar/debian/changelog b/pikabar/debian/changelog
index f141925..b7b2907 100644
--- a/pikabar/debian/changelog
+++ b/pikabar/debian/changelog
@@ -1,4 +1,4 @@
-pikabar (1.0.0-101pika3) pika; urgency=medium
+pikabar (1.0.0-101pika4) pika; urgency=medium
 
   * Font fixes
 
diff --git a/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml b/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml
index 9056159..e354dac 100644
--- a/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml
+++ b/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml
@@ -2,18 +2,28 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import Quickshell.Wayland
+import "root:/"
 
-RowLayout {
-
+Row {
     spacing: 10
+
     SimpleImage {
+        height: 42
         Layout.fillHeight: true
         implicitWidth: parent.height / 2
         source: ToplevelManager.activeToplevel ? Quickshell.iconPath(ToplevelManager.activeToplevel.appId) : ""
     }
 
-    WidgetText {
+    Text {
         id: text
+        height: 42
         text: ToplevelManager.activeToplevel?.title ?? ""
+        color: Globals.commonStyles.textColor
+        font.pointSize: Globals.commonStyles.smallTextFontSize
+        font.family: Globals.commonStyles.fontFamily
+        elide: Text.ElideRight
+        width: Math.min(implicitWidth, 300)
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
     }
-}
+}
\ No newline at end of file
diff --git a/pikabar/usr/share/pikabar/widgets/WidgetText.qml b/pikabar/usr/share/pikabar/widgets/WidgetText.qml
deleted file mode 100644
index 2819ad9..0000000
--- a/pikabar/usr/share/pikabar/widgets/WidgetText.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import QtQuick
-import "root:/"
-
-Rectangle {
-	implicitWidth: children[0].implicitWidth
-	implicitHeight: children[0].implicitHeight
-	color: "transparent"
-
-	property alias text: t.text
-	property alias family: t.font.family
-
-	Text {
-		id: t
-		anchors.fill: parent
-		color: Globals.commonStyles.textColor
-		font.pointSize: 13
-		font.family: Globals.commonStyles.fontFamily
-	}
-}