nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dashboard: fix player selector

Browse source 
Fixes #320
This commit is contained in:
2 * r + 2 * t 2025-08-01 22:37:20 +10:00
parent 4a49b9f0d6
commit bd28ebf5a0
4 changed files with 56 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
modules/dashboard/Media.qml
View file

@ -374,10 +374,11 @@ Item {
Layout.alignment: Qt.AlignVCenter
implicitWidth: slider.implicitWidth / 2
implicitHeight: currentPlayer.implicitHeight + Appearance.padding.small * 2
radius: Appearance.rounding.small
implicitWidth: slider.implicitWidth * 0.6
implicitHeight: currentPlayer.implicitHeight + Appearance.padding.smaller * 2
radius: Appearance.rounding.normal
color: Colours.palette.m3surfaceContainer
z: 1
StateLayer {
disabled: Players.list.length <= 1
@ -393,14 +394,13 @@ Item {
anchors.centerIn: parent
spacing: Appearance.spacing.small
IconImage {
Layout.fillHeight: true
implicitWidth: height
source: Players.active ? Icons.getAppIcon(Players.active.identity, "image-missing") : "image-missing"
PlayerIcon {
identity: Players.active?.identity ?? ""
}
StyledText {
Layout.fillWidth: true
Layout.maximumWidth: playerSelector.implicitWidth - implicitHeight - parent.spacing - Appearance.padding.normal * 2
text: Players.active?.identity ?? "No players"
color: Colours.palette.m3onSecondaryContainer
elide: Text.ElideRight
@ -425,20 +425,19 @@ Item {
StyledClippingRect {
id: playerSelectorBg
anchors.left: parent.left
anchors.right: parent.right
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom
implicitWidth: playerSelector.expanded ? playerList.implicitWidth : playerSelector.implicitWidth
implicitHeight: playerSelector.expanded ? playerList.implicitHeight : playerSelector.implicitHeight
color: Colours.palette.m3secondaryContainer
radius: Appearance.rounding.small
radius: Appearance.rounding.normal
opacity: playerSelector.expanded ? 1 : 0
ColumnLayout {
id: playerList
anchors.left: parent.left
anchors.right: parent.right
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom
spacing: 0
@ -452,7 +451,8 @@ Item {
required property MprisPlayer modelData
Layout.fillWidth: true
implicitHeight: playerInner.implicitHeight + Appearance.padding.small * 2
implicitWidth: playerInner.implicitWidth + Appearance.padding.normal * 2
implicitHeight: playerInner.implicitHeight + Appearance.padding.smaller * 2
StateLayer {
disabled: !playerSelector.expanded
@ -469,17 +469,13 @@ Item {
anchors.centerIn: parent
spacing: Appearance.spacing.small
IconImage {
Layout.fillHeight: true
implicitWidth: height
source: Icons.getAppIcon(player.modelData.identity, "image-missing")
PlayerIcon {
identity: player.modelData.identity
}
StyledText {
Layout.fillWidth: true
text: player.modelData.identity
color: Colours.palette.m3onSecondaryContainer
elide: Text.ElideRight
}
}
}
@ -492,6 +488,13 @@ Item {
}
}
Behavior on implicitWidth {
Anim {
duration: Appearance.anim.durations.expressiveDefaultSpatial
easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
}
}
Behavior on implicitHeight {
Anim {
duration: Appearance.anim.durations.expressiveDefaultSpatial
@ -540,6 +543,34 @@ Item {
}
}
component PlayerIcon: Loader {
id: loader
required property string identity
readonly property string icon: Icons.getAppIcon(identity)
Layout.fillHeight: true
asynchronous: true
sourceComponent: icon === "image://icon/" ? fallbackIcon : playerImage
Component {
id: playerImage
IconImage {
implicitWidth: height
source: loader.icon
}
}
Component {
id: fallbackIcon
MaterialIcon {
text: loader.identity ? "animated_images" : "music_off"
}
}
}
component ElideText: StyledText {
id: elideText

2
modules/detachedcontent/bluetooth/Settings.qml
View file

@ -209,7 +209,7 @@ ColumnLayout {
implicitHeight: adapterInner.implicitHeight + Appearance.padding.normal * 2
StateLayer {
enabled: adapterPickerButton.expanded
disabled: !adapterPickerButton.expanded
function onClicked(): void {
adapterPickerButton.expanded = false;

5
utils/Icons.qml
View file

@ -147,7 +147,10 @@ Singleton {
property string osName
function getAppIcon(name: string, fallback: string): string {
return Quickshell.iconPath(DesktopEntries.heuristicLookup(name)?.icon, fallback);
const icon = DesktopEntries.heuristicLookup(name)?.icon;
if (fallback !== "undefined")
return Quickshell.iconPath(icon, fallback);
return Quickshell.iconPath(icon);
}
function getAppCategoryIcon(name: string, fallback: string): string {

1
widgets/StateLayer.qml
View file

@ -15,6 +15,7 @@ MouseArea {
anchors.fill: parent
enabled: !disabled
cursorShape: disabled ? undefined : Qt.PointingHandCursor
hoverEnabled: true