From e75c86e0569e02ff4263b0bbb0cd06471313029b Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Mon, 21 Jul 2025 23:40:33 -0400 Subject: [PATCH 1/2] move to subfolder --- modules/bar/Bar.qml | 1 + modules/bar/components/{ => mpris}/Mpris.qml | 0 modules/bar/components/{ => mpris}/Player.qml | 8 ++++---- 3 files changed, 5 insertions(+), 4 deletions(-) rename modules/bar/components/{ => mpris}/Mpris.qml (100%) rename modules/bar/components/{ => mpris}/Player.qml (92%) diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index 01b9e12..b558aeb 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -1,6 +1,7 @@ import QtQuick import Quickshell import "components" +import "components/mpris" import "../../config/" Scope { diff --git a/modules/bar/components/Mpris.qml b/modules/bar/components/mpris/Mpris.qml similarity index 100% rename from modules/bar/components/Mpris.qml rename to modules/bar/components/mpris/Mpris.qml diff --git a/modules/bar/components/Player.qml b/modules/bar/components/mpris/Player.qml similarity index 92% rename from modules/bar/components/Player.qml rename to modules/bar/components/mpris/Player.qml index 2a40343..9316347 100644 --- a/modules/bar/components/Player.qml +++ b/modules/bar/components/mpris/Player.qml @@ -1,15 +1,15 @@ import Quickshell import Quickshell.Services.Mpris import QtQuick -import "../../../styled/" -import "../../../config/" +import "../../../../styled/" +import "../../../../config/" Item { required property MprisPlayer modelData required property int index - signal nextPlayer() - signal previousPlayer() + signal nextPlayer + signal previousPlayer anchors.horizontalCenter: parent.horizontalCenter implicitWidth: childrenRect.width From 00a46ac6ecf102cffbc63715f241e41bf4fc2837 Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Tue, 22 Jul 2025 09:13:43 -0400 Subject: [PATCH 2/2] fix width issue --- modules/bar/components/mpris/Mpris.qml | 7 +++++-- modules/bar/components/mpris/Player.qml | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/bar/components/mpris/Mpris.qml b/modules/bar/components/mpris/Mpris.qml index 6d8f63c..85dd15e 100644 --- a/modules/bar/components/mpris/Mpris.qml +++ b/modules/bar/components/mpris/Mpris.qml @@ -6,9 +6,9 @@ Item { id: root property int currentIndex: 0 + property var players: Mpris.players - implicitWidth: childrenRect.width - implicitHeight: childrenRect.height + anchors.horizontalCenter: parent.horizontalCenter Repeater { id: players @@ -16,6 +16,9 @@ Item { Player { + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + visible: index === root.currentIndex && modelData.canControl onNextPlayer: { diff --git a/modules/bar/components/mpris/Player.qml b/modules/bar/components/mpris/Player.qml index 9316347..e9bafe6 100644 --- a/modules/bar/components/mpris/Player.qml +++ b/modules/bar/components/mpris/Player.qml @@ -11,15 +11,15 @@ Item { signal nextPlayer signal previousPlayer - anchors.horizontalCenter: parent.horizontalCenter - implicitWidth: childrenRect.width + implicitWidth: text.width implicitHeight: Dimensions.mpris.height StyledLabel { - anchors.fill: parent + anchors.fill: text } StyledText { + id: text text: `${modelData.isPlaying ? "" : ""} ${modelData.trackTitle} - ${modelData.trackArtist}` anchors.verticalCenter: parent.verticalCenter @@ -32,7 +32,7 @@ Item { } MouseArea { - anchors.fill: parent + anchors.fill: text onClicked: { if (!modelData.canTogglePlaying) {