music controls: use pixbuf+cairo for cover art

- more reliable than gtk css
This commit is contained in:
end-4
2024-02-13 21:21:21 +07:00
parent 1577287624
commit 06245d13b0
+69 -16
View File
@@ -1,4 +1,4 @@
const { Gio, GLib } = imports.gi; const { Gdk, GdkPixbuf, Gio, GLib, Gtk } = imports.gi;
import App from 'resource:///com/github/Aylur/ags/app.js'; import App from 'resource:///com/github/Aylur/ags/app.js';
import Widget from 'resource:///com/github/Aylur/ags/widget.js'; import Widget from 'resource:///com/github/Aylur/ags/widget.js';
import * as Utils from 'resource:///com/github/Aylur/ags/utils.js'; import * as Utils from 'resource:///com/github/Aylur/ags/utils.js';
@@ -123,22 +123,66 @@ const TrackArtists = ({ player, ...rest }) => Label({
}, 'notify::track-artists'), }, 'notify::track-artists'),
}) })
const CoverArt = ({ player, ...rest }) => Box({ const CoverArt = ({ player, ...rest }) => {
...rest, const fallbackCoverArt = Box({ // Fallback
className: 'osd-music-cover',
children: [
Widget.Overlay({
child: Box({ // Fallback
className: 'osd-music-cover-fallback', className: 'osd-music-cover-fallback',
homogeneous: true, homogeneous: true,
children: [Label({ children: [Label({
className: 'icon-material txt-gigantic txt-thin', className: 'icon-material txt-gigantic txt-thin',
label: 'music_note', label: 'music_note',
})] })]
}), });
overlays: [ // Real const coverArtDrawingArea = Widget.DrawingArea({ className: 'osd-music-cover-art' });
Box({ const coverArtDrawingAreaStyleContext = coverArtDrawingArea.get_style_context();
const realCoverArt = Box({
className: 'osd-music-cover-art',
homogeneous: true,
children: [coverArtDrawingArea],
attribute: { attribute: {
'pixbuf': null,
'showImage': (self, imagePath) => {
const borderRadius = coverArtDrawingAreaStyleContext.get_property('border-radius', Gtk.StateFlags.NORMAL);
const frameHeight = coverArtDrawingAreaStyleContext.get_property('min-height', Gtk.StateFlags.NORMAL);
const frameWidth = coverArtDrawingAreaStyleContext.get_property('min-width', Gtk.StateFlags.NORMAL);
let imageHeight = frameHeight;
let imageWidth = frameWidth;
// Get image dimensions
execAsync(['identify', '-format', '{"w":%w,"h":%h}', imagePath])
.then((output) => {
const imageDimensions = JSON.parse(output);
const imageAspectRatio = imageDimensions.w / imageDimensions.h;
const displayedAspectRatio = imageWidth / imageHeight;
if (imageAspectRatio >= displayedAspectRatio) {
imageWidth = imageHeight * imageAspectRatio;
} else {
imageHeight = imageWidth / imageAspectRatio;
}
// Real stuff
// TODO: fix memory leak(?)
// if (self.attribute.pixbuf) {
// self.attribute.pixbuf.unref();
// self.attribute.pixbuf = null;
// }
self.attribute.pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(imagePath, imageWidth, imageHeight);
coverArtDrawingArea.set_size_request(frameWidth, frameHeight);
coverArtDrawingArea.connect("draw", (widget, cr) => {
// Clip a rounded rectangle area
cr.arc(borderRadius, borderRadius, borderRadius, Math.PI, 1.5 * Math.PI);
cr.arc(frameWidth - borderRadius, borderRadius, borderRadius, 1.5 * Math.PI, 2 * Math.PI);
cr.arc(frameWidth - borderRadius, frameHeight - borderRadius, borderRadius, 0, 0.5 * Math.PI);
cr.arc(borderRadius, frameHeight - borderRadius, borderRadius, 0.5 * Math.PI, Math.PI);
cr.closePath();
cr.clip();
// Paint image as bg, centered
Gdk.cairo_set_source_pixbuf(cr, self.attribute.pixbuf,
frameWidth / 2 - imageWidth / 2,
frameHeight / 2 - imageHeight / 2
);
cr.paint();
});
}).catch(print)
},
'updateCover': (self) => { 'updateCover': (self) => {
// const player = Mpris.getPlayer(); // Maybe no need to re-get player.. can't remember why I had this // const player = Mpris.getPlayer(); // Maybe no need to re-get player.. can't remember why I had this
// Player closed // Player closed
@@ -152,13 +196,15 @@ const CoverArt = ({ player, ...rest }) => Box({
const coverPath = player.coverPath; const coverPath = player.coverPath;
const stylePath = `${player.coverPath}${lightDark}${COVER_COLORSCHEME_SUFFIX}`; const stylePath = `${player.coverPath}${lightDark}${COVER_COLORSCHEME_SUFFIX}`;
if (player.coverPath == lastCoverPath) { // Since 'notify::cover-path' emits on cover download complete if (player.coverPath == lastCoverPath) { // Since 'notify::cover-path' emits on cover download complete
Utils.timeout(200, () => { self.css = `background-image: url('${coverPath}');`; }); // Utils.timeout(200, () => { self.css = `background-image: url('${coverPath}');`; });
Utils.timeout(200, () => self.attribute.showImage(self, coverPath));
} }
lastCoverPath = player.coverPath; lastCoverPath = player.coverPath;
// If a colorscheme has already been generated, skip generation // If a colorscheme has already been generated, skip generation
if (fileExists(stylePath)) { if (fileExists(stylePath)) {
Utils.timeout(200, () => { self.css = `background-image: url('${coverPath}');`; }); // Utils.timeout(200, () => { self.css = `background-image: url('${coverPath}');`; });
self.attribute.showImage(self, coverPath)
App.applyCss(stylePath); App.applyCss(stylePath);
return; return;
} }
@@ -170,23 +216,30 @@ const CoverArt = ({ player, ...rest }) => Box({
exec(`wal -i "${player.coverPath}" -n -t -s -e -q ${lightDark}`) exec(`wal -i "${player.coverPath}" -n -t -s -e -q ${lightDark}`)
exec(`cp ${GLib.get_user_cache_dir()}/wal/colors.scss ${App.configDir}/scss/_musicwal.scss`); exec(`cp ${GLib.get_user_cache_dir()}/wal/colors.scss ${App.configDir}/scss/_musicwal.scss`);
exec(`sassc ${App.configDir}/scss/_music.scss ${stylePath}`); exec(`sassc ${App.configDir}/scss/_music.scss ${stylePath}`);
self.css = `background-image: url('${coverPath}');`; // self.css = `background-image: url('${coverPath}');`;
Utils.timeout(200, () => self.attribute.showImage(self, coverPath));
App.applyCss(`${stylePath}`); App.applyCss(`${stylePath}`);
}) })
.catch(print); .catch(print);
}, },
}, },
className: 'osd-music-cover-art',
setup: (self) => self setup: (self) => self
.hook(player, (self) => { .hook(player, (self) => {
self.attribute.updateCover(self); self.attribute.updateCover(self);
}, 'notify::cover-path') }, 'notify::cover-path')
, ,
}) });
] return Box({
...rest,
className: 'osd-music-cover',
children: [
Widget.Overlay({
child: fallbackCoverArt,
overlays: [realCoverArt],
}) })
], ],
}) })
}
const TrackControls = ({ player, ...rest }) => Widget.Revealer({ const TrackControls = ({ player, ...rest }) => Widget.Revealer({
revealChild: false, revealChild: false,