summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/bar/popouts/ActiveWindow.qml3
-rw-r--r--modules/dashboard/Media.qml188
-rw-r--r--services/Players.qml3
-rw-r--r--utils/Icons.qml4
4 files changed, 190 insertions, 8 deletions
diff --git a/modules/bar/popouts/ActiveWindow.qml b/modules/bar/popouts/ActiveWindow.qml
index 820d7d4..2e3b5b5 100644
--- a/modules/bar/popouts/ActiveWindow.qml
+++ b/modules/bar/popouts/ActiveWindow.qml
@@ -2,7 +2,6 @@ import "root:/widgets"
import "root:/services"
import "root:/utils"
import "root:/config"
-import Quickshell
import Quickshell.Widgets
import Quickshell.Wayland
import QtQuick
@@ -28,7 +27,7 @@ Item {
id: icon
implicitSize: details.implicitHeight
- source: Icons.getAppIcon(Hyprland.activeClient?.wmClass ?? "")
+ source: Icons.getAppIcon(Hyprland.activeClient?.wmClass ?? "", "image-missing")
}
Column {
diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml
index 30c629a..5e5237c 100644
--- a/modules/dashboard/Media.qml
+++ b/modules/dashboard/Media.qml
@@ -2,11 +2,14 @@ pragma ComponentBehavior: Bound
import "root:/widgets"
import "root:/services"
+import "root:/utils"
import "root:/config"
import Quickshell.Io
import Quickshell.Widgets
+import Quickshell.Services.Mpris
import QtQuick
import QtQuick.Controls
+import QtQuick.Effects
Item {
id: root
@@ -323,6 +326,182 @@ Item {
font.pointSize: Appearance.font.size.small
}
}
+
+ Row {
+ anchors.horizontalCenter: parent.horizontalCenter
+
+ spacing: Appearance.spacing.small
+
+ Control {
+ icon: "flip_to_front"
+ canUse: Players.active?.canRaise ?? false
+ fontSize: Appearance.font.size.larger
+ padding: Appearance.padding.small
+ fill: false
+ color: Colours.palette.m3surfaceContainer
+
+ function onClicked(): void {
+ Players.active?.raise();
+ }
+ }
+
+ MouseArea {
+ id: playerSelector
+
+ property bool expanded
+
+ anchors.verticalCenter: parent.verticalCenter
+
+ implicitWidth: slider.implicitWidth / 2
+ implicitHeight: currentPlayer.implicitHeight + Appearance.padding.small * 2
+
+ cursorShape: Qt.PointingHandCursor
+ onClicked: expanded = !expanded
+
+ RectangularShadow {
+ anchors.fill: playerSelectorBg
+
+ opacity: playerSelector.expanded ? 1 : 0
+ radius: playerSelectorBg.radius
+ color: Colours.palette.m3shadow
+ blur: 5
+ spread: 0
+
+ Behavior on opacity {
+ NumberAnimation {
+ duration: Appearance.anim.durations.normal
+ easing.type: Easing.BezierSpline
+ easing.bezierCurve: Appearance.anim.curves.standard
+ }
+ }
+ }
+
+ StyledRect {
+ id: playerSelectorBg
+
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+
+ implicitHeight: playersWrapper.implicitHeight + Appearance.padding.small * 2
+
+ color: Colours.palette.m3secondaryContainer
+ radius: Appearance.rounding.normal
+
+ Item {
+ id: playersWrapper
+
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+ anchors.margins: Appearance.padding.small
+
+ clip: true
+ implicitHeight: playerSelector.expanded && Players.list.length > 1 ? players.implicitHeight : currentPlayer.implicitHeight
+
+ Column {
+ id: players
+
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.bottom: parent.bottom
+
+ spacing: Appearance.spacing.small
+
+ Repeater {
+ model: Players.list.filter(p => p !== Players.active)
+
+ Row {
+ id: player
+
+ required property MprisPlayer modelData
+
+ anchors.horizontalCenter: parent.horizontalCenter
+ spacing: Appearance.spacing.small
+
+ IconImage {
+ source: Icons.getAppIcon(player.modelData.identity, "image-missing")
+ implicitSize: Math.round(identity.implicitHeight * 0.9)
+ }
+
+ StyledText {
+ id: identity
+
+ text: player.modelData.identity
+ color: Colours.palette.m3onSecondaryContainer
+
+ MouseArea {
+
+ anchors.fill: parent
+
+ cursorShape: Qt.PointingHandCursor
+ onClicked: {
+ Players.manualActive = player.modelData;
+ playerSelector.expanded = false;
+ }
+ }
+ }
+ }
+ }
+
+ Item {
+ anchors.left: parent.left
+ anchors.right: parent.right
+ implicitHeight: 1
+
+ StyledRect {
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.margins: -Appearance.padding.normal
+ color: Colours.palette.m3secondary
+ implicitHeight: 1
+ }
+ }
+
+ Row {
+ id: currentPlayer
+
+ anchors.horizontalCenter: parent.horizontalCenter
+ spacing: Appearance.spacing.small
+
+ IconImage {
+ source: Icons.getAppIcon(Players.active?.identity ?? "", "applications-multimedia")
+ implicitSize: Math.round(currentIdentity.implicitHeight * 0.9)
+ }
+
+ StyledText {
+ id: currentIdentity
+
+ animate: true
+ text: Players.active?.identity ?? "No media"
+ color: Colours.palette.m3onSecondaryContainer
+ }
+ }
+ }
+
+ Behavior on implicitHeight {
+ NumberAnimation {
+ duration: Appearance.anim.durations.normal
+ easing.type: Easing.BezierSpline
+ easing.bezierCurve: Appearance.anim.curves.emphasized
+ }
+ }
+ }
+ }
+ }
+
+ Control {
+ icon: "delete"
+ canUse: Players.active?.canQuit ?? false
+ fontSize: Appearance.font.size.larger
+ padding: Appearance.padding.small
+ fill: false
+ color: Colours.palette.m3surfaceContainer
+
+ function onClicked(): void {
+ Players.active?.quit();
+ }
+ }
+ }
}
AnimatedImage {
@@ -344,11 +523,14 @@ Item {
required property string icon
required property bool canUse
+ property int fontSize: Appearance.font.size.extraLarge
+ property int padding
+ property bool fill: true
property bool primary
function onClicked(): void {
}
- implicitWidth: Math.max(icon.implicitHeight, icon.implicitHeight) + Appearance.padding.small
+ implicitWidth: Math.max(icon.implicitWidth, icon.implicitHeight) + padding * 2
implicitHeight: implicitWidth
radius: Appearance.rounding.full
@@ -371,10 +553,10 @@ Item {
anchors.verticalCenterOffset: font.pointSize * 0.05
animate: true
- fill: 1
+ fill: control.fill ? 1 : 0
text: control.icon
color: control.canUse ? control.primary ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface : Colours.palette.m3outline
- font.pointSize: Appearance.font.size.extraLarge
+ font.pointSize: control.fontSize
}
}
}
diff --git a/services/Players.qml b/services/Players.qml
index aaf1f9b..cbaf550 100644
--- a/services/Players.qml
+++ b/services/Players.qml
@@ -9,7 +9,8 @@ Singleton {
id: root
readonly property list<MprisPlayer> list: Mpris.players.values
- readonly property MprisPlayer active: list.find(p => p.identity === "Spotify") ?? list[0] ?? null
+ readonly property MprisPlayer active: manualActive ?? list.find(p => p.identity === "Spotify") ?? list[0] ?? null
+ property MprisPlayer manualActive
CustomShortcut {
name: "mediaToggle"
diff --git a/utils/Icons.qml b/utils/Icons.qml
index ca3917c..41ecbfa 100644
--- a/utils/Icons.qml
+++ b/utils/Icons.qml
@@ -156,8 +156,8 @@ Singleton {
return DesktopEntries.applications.values.find(a => a.id.toLowerCase() === name) ?? null;
}
- function getAppIcon(name: string): string {
- return Quickshell.iconPath(getDesktopEntry(name)?.icon, "image-missing");
+ function getAppIcon(name: string, fallback: string): string {
+ return Quickshell.iconPath(getDesktopEntry(name)?.icon, fallback);
}
function getAppCategoryIcon(name: string, fallback: string): string {
generated by cgit v1.2.3-freya (git 2.51.1) at 2026-01-20 04:13:55 +0000