Added a command to adjust volume that respects hyprpanel settings and made bar module settings for click events apply immediately. (#619)
This commit is contained in:
@@ -4,7 +4,6 @@ import options from 'src/options';
|
||||
import { runAsyncCommand, throttledScrollHandler } from 'src/components/bar/utils/helpers.js';
|
||||
import Variable from 'astal/variable.js';
|
||||
import { bind } from 'astal/binding.js';
|
||||
import { useHook } from 'src/lib/shared/hookHandler.js';
|
||||
import { onMiddleClick, onPrimaryClick, onScroll, onSecondaryClick } from 'src/lib/shared/eventHandlers.js';
|
||||
import { getIcon } from './helpers/index.js';
|
||||
import { BarBoxChild } from 'src/lib/types/bar.js';
|
||||
@@ -77,30 +76,43 @@ const Volume = (): BarBoxChild => {
|
||||
boxClass: 'volume',
|
||||
props: {
|
||||
setup: (self: Astal.Button): void => {
|
||||
useHook(self, options.bar.scrollSpeed, () => {
|
||||
const throttledHandler = throttledScrollHandler(options.bar.scrollSpeed.get());
|
||||
let disconnectFunctions: (() => void)[] = [];
|
||||
|
||||
const disconnectPrimary = onPrimaryClick(self, (clicked, event) => {
|
||||
openMenu(clicked, event, 'audiomenu');
|
||||
});
|
||||
Variable.derive(
|
||||
[
|
||||
bind(rightClick),
|
||||
bind(middleClick),
|
||||
bind(scrollUp),
|
||||
bind(scrollDown),
|
||||
bind(options.bar.scrollSpeed),
|
||||
],
|
||||
() => {
|
||||
disconnectFunctions.forEach((disconnect) => disconnect());
|
||||
disconnectFunctions = [];
|
||||
|
||||
const disconnectSecondary = onSecondaryClick(self, (clicked, event) => {
|
||||
runAsyncCommand(rightClick.get(), { clicked, event });
|
||||
});
|
||||
const throttledHandler = throttledScrollHandler(options.bar.scrollSpeed.get());
|
||||
|
||||
const disconnectMiddle = onMiddleClick(self, (clicked, event) => {
|
||||
runAsyncCommand(middleClick.get(), { clicked, event });
|
||||
});
|
||||
disconnectFunctions.push(
|
||||
onPrimaryClick(self, (clicked, event) => {
|
||||
openMenu(clicked, event, 'audiomenu');
|
||||
}),
|
||||
);
|
||||
|
||||
const disconnectScroll = onScroll(self, throttledHandler, scrollUp.get(), scrollDown.get());
|
||||
disconnectFunctions.push(
|
||||
onSecondaryClick(self, (clicked, event) => {
|
||||
runAsyncCommand(rightClick.get(), { clicked, event });
|
||||
}),
|
||||
);
|
||||
|
||||
return (): void => {
|
||||
disconnectPrimary();
|
||||
disconnectSecondary();
|
||||
disconnectMiddle();
|
||||
disconnectScroll();
|
||||
};
|
||||
});
|
||||
disconnectFunctions.push(
|
||||
onMiddleClick(self, (clicked, event) => {
|
||||
runAsyncCommand(middleClick.get(), { clicked, event });
|
||||
}),
|
||||
);
|
||||
|
||||
disconnectFunctions.push(onScroll(self, throttledHandler, scrollUp.get(), scrollDown.get()));
|
||||
},
|
||||
);
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user