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 73% rename from modules/bar/components/Mpris.qml rename to modules/bar/components/mpris/Mpris.qml index 6d8f63c..85dd15e 100644 --- a/modules/bar/components/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/Player.qml b/modules/bar/components/mpris/Player.qml similarity index 82% rename from modules/bar/components/Player.qml rename to modules/bar/components/mpris/Player.qml index 2a40343..e9bafe6 100644 --- a/modules/bar/components/Player.qml +++ b/modules/bar/components/mpris/Player.qml @@ -1,25 +1,25 @@ 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 + 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) {