diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index b558aeb..01b9e12 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -1,7 +1,6 @@ import QtQuick import Quickshell import "components" -import "components/mpris" import "../../config/" Scope { diff --git a/modules/bar/components/mpris/Mpris.qml b/modules/bar/components/Mpris.qml similarity index 73% rename from modules/bar/components/mpris/Mpris.qml rename to modules/bar/components/Mpris.qml index 85dd15e..6d8f63c 100644 --- a/modules/bar/components/mpris/Mpris.qml +++ b/modules/bar/components/Mpris.qml @@ -6,9 +6,9 @@ Item { id: root property int currentIndex: 0 - property var players: Mpris.players - anchors.horizontalCenter: parent.horizontalCenter + implicitWidth: childrenRect.width + implicitHeight: childrenRect.height Repeater { id: players @@ -16,9 +16,6 @@ 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/Player.qml similarity index 82% rename from modules/bar/components/mpris/Player.qml rename to modules/bar/components/Player.qml index e9bafe6..2a40343 100644 --- a/modules/bar/components/mpris/Player.qml +++ b/modules/bar/components/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() - implicitWidth: text.width + anchors.horizontalCenter: parent.horizontalCenter + implicitWidth: childrenRect.width implicitHeight: Dimensions.mpris.height StyledLabel { - anchors.fill: text + anchors.fill: parent } StyledText { - id: text text: `${modelData.isPlaying ? "" : ""} ${modelData.trackTitle} - ${modelData.trackArtist}` anchors.verticalCenter: parent.verticalCenter @@ -32,7 +32,7 @@ Item { } MouseArea { - anchors.fill: text + anchors.fill: parent onClicked: { if (!modelData.canTogglePlaying) {