Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-04 12:38:31 -04:00
Code Packages Releases Activity

fix(media-player): update Mpris stable metadata handling

Browse Source 
- Restores Brave browsers
port 1.5

(cherry picked from commit fe1a783ec2)
This commit is contained in:
purian23
2026-07-15 20:57:05 -04:00
committed by dms-ci[bot]
parent 3d0ce17a8c
commit a55177f1d2
6 changed files with 181 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Modules/DankBar/Widgets/Media.qml
+3 -30
View File
@@ -13,33 +13,6 @@ BasePill {
readonly property bool _hoverPreview: MprisController.isFirefoxYoutubeHoverPreview(activePlayer)
readonly property bool _isPlaying: !!activePlayer && activePlayer.playbackState === 1 && !_hoverPreview
property string _stableTitle: ""
property string _stableArtist: ""
Connections {
target: root.activePlayer
function onTrackTitleChanged() {
root._syncMeta();
}
function onTrackArtistChanged() {
root._syncMeta();
}
}
onActivePlayerChanged: _syncMeta()
function _syncMeta() {
if (!activePlayer) {
_stableTitle = "";
_stableArtist = "";
return;
}
if (MprisController.isFirefoxYoutubeHoverPreview(activePlayer))
return;
_stableTitle = activePlayer.trackTitle || "";
_stableArtist = activePlayer.trackArtist || "";
}
readonly property bool __isChromeBrowser: {
if (!activePlayer?.identity)
return false;
@@ -310,10 +283,10 @@ BasePill {
readonly property bool isWebMedia: lowerIdentity.includes("firefox") || lowerIdentity.includes("chrome") || lowerIdentity.includes("chromium") || lowerIdentity.includes("edge") || lowerIdentity.includes("safari")
property string displayText: {
if (!activePlayer || !root._stableTitle)
if (!activePlayer || !MprisController.stableTitle)
return "";
const title = isWebMedia ? root._stableTitle : (root._stableTitle || "Unknown Track");
const subtitle = isWebMedia ? (root._stableArtist || cachedIdentity) : (root._stableArtist || "");
const title = MprisController.stableTitle;
const subtitle = isWebMedia ? (MprisController.stableArtist || cachedIdentity) : MprisController.stableArtist;
return subtitle.length > 0 ? title + " • " + subtitle : title;
}
quickshell/Modules/DankDash/MediaDropdownOverlay.qml
+23 -4
View File
@@ -14,6 +14,8 @@ Item {
property int dropdownType: 0
property var activePlayer: null
property var allPlayers: []
// Chromium keeps dead MPRIS services registered w/empty metadata; avoid listing them
readonly property var selectablePlayers: (allPlayers || []).filter(p => p && !MprisController.isIdle(p))
property point anchorPos: Qt.point(0, 0)
property bool isRightEdge: false
property var targetWindow: null
@@ -64,6 +66,22 @@ Item {
panelExited();
}
property real _wheelAccum: 0
function volumeWheel(wheelEvent) {
if (!volumeAvailable)
return;
wheelEvent.accepted = true;
_wheelAccum += wheelEvent.angleDelta.y;
const notches = _wheelAccum > 0 ? Math.floor(_wheelAccum / 120) : Math.ceil(_wheelAccum / 120);
if (notches === 0)
return;
_wheelAccum -= notches * 120;
SessionData.suppressOSDTemporarily();
const next = currentVolume + notches * AudioService.wheelVolumeStep / 100;
root.volumeChanged(Math.max(0, Math.min(1, next)));
}
readonly property Item __activePanel: {
switch (dropdownType) {
case 1:
@@ -144,6 +162,7 @@ Item {
hoverEnabled: true
onEntered: panelAreaEntered()
onExited: panelAreaExited()
onWheel: wheelEvent => root.volumeWheel(wheelEvent)
}
Item {
@@ -203,6 +222,7 @@ Item {
onEntered: panelAreaEntered()
onExited: panelAreaExited()
onWheel: wheelEvent => root.volumeWheel(wheelEvent)
onPressed: mouse => updateVolume(mouse)
onPositionChanged: mouse => {
if (pressed)
@@ -428,7 +448,7 @@ Item {
id: playersPanel
visible: dropdownType === 3
width: 240
height: Math.max(180, Math.min(240, (allPlayers?.length || 0) * 50 + 80))
height: Math.max(180, Math.min(240, (root.selectablePlayers?.length || 0) * 50 + 80))
x: isRightEdge ? anchorPos.x : anchorPos.x - width
y: anchorPos.y - height / 2
radius: Theme.cornerRadius * 2
@@ -485,7 +505,7 @@ Item {
anchors.margins: Theme.spacingM
StyledText {
text: I18n.tr("Media Players (") + (allPlayers?.length || 0) + ")"
text: I18n.tr("Media Players (") + (root.selectablePlayers?.length || 0) + ")"
font.pixelSize: Theme.fontSizeMedium
font.weight: Font.Medium
color: Theme.surfaceText
@@ -506,7 +526,7 @@ Item {
spacing: Theme.spacingS
Repeater {
model: allPlayers || []
model: root.selectablePlayers || []
delegate: Rectangle {
required property var modelData
required property int index
@@ -582,5 +602,4 @@ Item {
}
}
}
}
quickshell/Modules/DankDash/MediaPlayerTab.qml
+63 -68
View File
@@ -47,8 +47,6 @@ Item {
playersExpanded = false;
}
readonly property bool isRightEdge: {
if (barPosition === SettingsData.Position.Right)
return true;
@@ -342,54 +340,6 @@ Item {
root.maybeFinishSwitch();
}
component BgBlurLayer: ClippingRectangle {
id: layer
property alias art: layerImg.source
readonly property bool ready: layerImg.status === Image.Ready && layerImg.source != ""
property bool front: false
signal loaded
anchors.fill: parent
radius: Theme.cornerRadius
color: "transparent"
antialiasing: true
opacity: front ? 0.7 : 0
Behavior on opacity {
NumberAnimation {
duration: 350
easing.type: Easing.InOutQuad
}
}
Image {
id: layerImg
anchors.centerIn: parent
width: Math.max(parent.width, parent.height) * 1.1
height: width
fillMode: Image.PreserveAspectCrop
asynchronous: true
cache: true
visible: false
onStatusChanged: {
if (status === Image.Ready && source != "")
layer.loaded();
}
}
MultiEffect {
anchors.centerIn: parent
width: layerImg.width
height: layerImg.height
source: layerImg
blurEnabled: true
blurMax: 64
blur: 0.8
saturation: -0.2
brightness: -0.25
}
}
BgBlurLayer {
id: layerA
front: bgContainer._showA
@@ -410,6 +360,54 @@ Item {
}
}
component BgBlurLayer: ClippingRectangle {
id: layer
property alias art: layerImg.source
readonly property bool ready: layerImg.status === Image.Ready && layerImg.source != ""
property bool front: false
signal loaded
anchors.fill: parent
radius: Theme.cornerRadius
color: "transparent"
antialiasing: true
opacity: front ? 0.7 : 0
Behavior on opacity {
NumberAnimation {
duration: 350
easing.type: Easing.InOutQuad
}
}
Image {
id: layerImg
anchors.centerIn: parent
width: Math.max(parent.width, parent.height) * 1.1
height: width
fillMode: Image.PreserveAspectCrop
asynchronous: true
cache: true
visible: false
onStatusChanged: {
if (status === Image.Ready && source != "")
layer.loaded();
}
}
MultiEffect {
anchors.centerIn: parent
width: layerImg.width
height: layerImg.height
source: layerImg
blurEnabled: true
blurMax: 64
blur: 0.8
saturation: -0.2
brightness: -0.25
}
}
Column {
anchors.centerIn: parent
spacing: Theme.spacingM
@@ -469,7 +467,7 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter
StyledText {
text: activePlayer?.trackTitle || I18n.tr("Unknown Track")
text: MprisController.stableTitle || I18n.tr("Unknown Track")
font.pixelSize: Theme.fontSizeLarge
font.weight: Font.Bold
color: Theme.surfaceText
@@ -481,7 +479,7 @@ Item {
}
StyledText {
text: activePlayer?.trackArtist || I18n.tr("Unknown Artist")
text: MprisController.stableArtist || I18n.tr("Unknown Artist")
font.pixelSize: Theme.fontSizeMedium
color: Theme.surfaceTextMedium
width: parent.width
@@ -799,16 +797,17 @@ Item {
cursorShape: Qt.PointingHandCursor
onClicked: {
if (playersExpanded) {
if (allPlayers && allPlayers.length > 1) {
const players = (root.allPlayers || []).filter(p => p && !MprisController.isIdle(p));
if (players.length > 1) {
let currentIndex = -1;
for (let i = 0; i < allPlayers.length; i++) {
if (allPlayers[i] === activePlayer) {
for (let i = 0; i < players.length; i++) {
if (players[i] === root.activePlayer) {
currentIndex = i;
break;
}
}
const nextIndex = (currentIndex + 1) % allPlayers.length;
MprisController.setActivePlayer(allPlayers[nextIndex]);
const nextIndex = (currentIndex + 1) % players.length;
MprisController.setActivePlayer(players[nextIndex]);
}
return;
}
@@ -885,19 +884,15 @@ Item {
onClicked: {
toggleMute();
}
property real wheelAccum: 0
onWheel: wheelEvent => {
SessionData.suppressOSDTemporarily();
const delta = wheelEvent.angleDelta.y;
const current = (currentVolume * 100) || 0;
const maxVol = usePlayerVolume ? 100 : AudioService.sinkMaxVolume;
const newVolume = delta > 0 ? Math.min(maxVol, current + 5) : Math.max(0, current - 5);
if (usePlayerVolume) {
activePlayer.volume = newVolume / 100;
} else if (AudioService.sink?.audio) {
AudioService.sink.audio.volume = newVolume / 100;
}
wheelEvent.accepted = true;
wheelAccum += wheelEvent.angleDelta.y;
const notches = wheelAccum > 0 ? Math.floor(wheelAccum / 120) : Math.ceil(wheelAccum / 120);
if (notches === 0)
return;
wheelAccum -= notches * 120;
root.adjustVolume(notches * AudioService.wheelVolumeStep);
}
}
}
quickshell/Modules/DankDash/Overview/MediaOverviewCard.qml
+2 -2
View File
@@ -88,7 +88,7 @@ Card {
topPadding: Theme.spacingL
StyledText {
text: activePlayer?.trackTitle || I18n.tr("Unknown")
text: MprisController.stableTitle || I18n.tr("Unknown")
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium
color: Theme.surfaceText
@@ -99,7 +99,7 @@ Card {
}
StyledText {
text: activePlayer?.trackArtist || I18n.tr("Unknown Artist")
text: MprisController.stableArtist || I18n.tr("Unknown Artist")
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceTextMedium
width: parent.width