LESA/custum-hyprpanel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a command to adjust volume that respects hyprpanel settings and made bar module settings for click events apply immediately. (#619)

Browse Source
This commit is contained in:
Jas Singh
2024-12-24 14:46:37 -08:00
committed by GitHub
parent 1b31f04ba9
commit 38bbcf96ef
18 changed files with 495 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/components/bar/modules/media/index.tsx
View File

@@ -1,18 +1,26 @@
import { openMenu } from '../../utils/menu.js';
import options from 'src/options.js';
import { runAsyncCommand } from 'src/components/bar/utils/helpers.js';
import { runAsyncCommand, throttledScrollHandler } from 'src/components/bar/utils/helpers.js';
import { generateMediaLabel } from './helpers/index.js';
import { useHook } from 'src/lib/shared/hookHandler.js';
import { mprisService } from 'src/lib/constants/services.js';
import Variable from 'astal/variable.js';
import { onMiddleClick, onPrimaryClick, onSecondaryClick } from 'src/lib/shared/eventHandlers.js';
import { onMiddleClick, onPrimaryClick, onScroll, onSecondaryClick } from 'src/lib/shared/eventHandlers.js';
import { bind } from 'astal/binding.js';
import { BarBoxChild } from 'src/lib/types/bar.js';
import { Astal } from 'astal/gtk3';
import { activePlayer, mediaAlbum, mediaArtist, mediaTitle } from 'src/globals/media.js';
const { truncation, truncation_size, show_label, show_active_only, rightClick, middleClick, format } =
options.bar.media;
const {
truncation,
truncation_size,
show_label,
show_active_only,
rightClick,
middleClick,
scrollUp,
scrollDown,
format,
} = options.bar.media;
const isVis = Variable(!show_active_only.get());
@@ -71,25 +79,43 @@ const Media = (): BarBoxChild => {
boxClass: 'media',
props: {
setup: (self: Astal.Button): void => {
useHook(self, options.bar.scrollSpeed, () => {
const disconnectPrimary = onPrimaryClick(self, (clicked, event) => {
openMenu(clicked, event, 'mediamenu');
});
let disconnectFunctions: (() => void)[] = [];
const disconnectSecondary = onSecondaryClick(self, (clicked, event) => {
runAsyncCommand(rightClick.get(), { clicked, event });
});
Variable.derive(
[
bind(rightClick),
bind(middleClick),
bind(scrollUp),
bind(scrollDown),
bind(options.bar.scrollSpeed),
],
() => {
disconnectFunctions.forEach((disconnect) => disconnect());
disconnectFunctions = [];
const disconnectMiddle = onMiddleClick(self, (clicked, event) => {
runAsyncCommand(middleClick.get(), { clicked, event });
});
const throttledHandler = throttledScrollHandler(options.bar.scrollSpeed.get());
return (): void => {
disconnectPrimary();
disconnectSecondary();
disconnectMiddle();
};
});
disconnectFunctions.push(
onPrimaryClick(self, (clicked, event) => {
openMenu(clicked, event, 'mediamenu');
}),
);
disconnectFunctions.push(
onSecondaryClick(self, (clicked, event) => {
runAsyncCommand(rightClick.get(), { clicked, event });
}),
);
disconnectFunctions.push(
onMiddleClick(self, (clicked, event) => {
runAsyncCommand(middleClick.get(), { clicked, event });
}),
);
disconnectFunctions.push(onScroll(self, throttledHandler, scrollUp.get(), scrollDown.get()));
},
);
},
},
};