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

Fixed lingering menus when switching screens and fixed hour timer for media menu.

Browse Source
This commit is contained in:
Jas Singh
2024-06-23 20:57:52 -07:00
parent 5eef18485d
commit 42b8948e48
9 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/bar/bar.js
View File

@@ -13,6 +13,13 @@ import { Power } from "./power/index.js";
import { BarItemBox } from "../shared/barItemBox.js";
const closeAllMenus = () => {
App.closeWindow("bluetoothmenu");
App.closeWindow("audiomenu");
App.closeWindow("networkmenu");
App.closeWindow("mediamenu");
}
// layout of the bar
const Left = (monitor, wsMap) => {
return Widget.Box({
@@ -114,4 +121,4 @@ const BarAlt = (monitor = 0, wsMap) => {
});
};
export { Bar, BarAlt };
export { Bar, BarAlt, closeAllMenus };

2
modules/bar/bluetooth/index.js
View File

@@ -1,4 +1,5 @@
const bluetooth = await Service.import('bluetooth')
import { closeAllMenus } from "../bar.js";
const Bluetooth = () => {
const btIcon = Widget.Label({
@@ -24,6 +25,7 @@ const Bluetooth = () => {
globalMousePos.value = coords;
closeAllMenus();
App.toggleWindow("bluetoothmenu");
},
},

2
modules/bar/clock/index.js
View File

@@ -1,5 +1,5 @@
const date = Variable("", {
poll: [1000, 'date "+󰃭 %a %b %d %I:%M:%S %p"'],
poll: [1000, 'date "+󰃭 %a %b %d 󱑍 %I:%M:%S %p"'],
});
const Clock = () => {

2
modules/bar/media/index.js
View File

@@ -1,4 +1,5 @@
const mpris = await Service.import("mpris");
import { closeAllMenus } from "../bar.js";
const Media = () => {
const activePlayer = Variable(mpris.players[0]);
@@ -96,6 +97,7 @@ const Media = () => {
globalMousePos.value = coords;
closeAllMenus();
App.toggleWindow("mediamenu");
},
},

2
modules/bar/network/index.js
View File

@@ -1,4 +1,5 @@
const network = await Service.import("network");
import { closeAllMenus } from "../bar.js";
import { globalMousePos } from "../../../globals.js";
@@ -35,6 +36,7 @@ const Network = () => {
globalMousePos.value = coords;
closeAllMenus();
App.toggleWindow("networkmenu");
},
},

2
modules/bar/volume/index.js
View File

@@ -1,4 +1,5 @@
const audio = await Service.import("audio");
import { closeAllMenus } from "../bar.js";
import { globalMousePos } from "../../../globals.js";
@@ -47,6 +48,7 @@ const Volume = () => {
globalMousePos.value = coords;
closeAllMenus();
App.toggleWindow("audiomenu");
},
},

14
modules/menus/media/index.js
View File

@@ -254,8 +254,11 @@ export default () => {
vpack: "center",
setup: (self) => {
function update() {
const curHour = Math.floor(
curPlayer.position / 3600,
);
const curMin = Math.floor(
curPlayer.position / 60,
(curPlayer.position % 3600) / 60,
);
const curSec = Math.floor(
curPlayer.position % 60,
@@ -265,7 +268,14 @@ export default () => {
typeof curPlayer.position === "number" &&
curPlayer.position >= 0
) {
self.label = `${curMin < 10 ? "0" + curMin : curMin}:${curSec < 10 ? "0" + curSec : curSec}`;
// WARN: These nested ternaries are absolutely disgusting lol
self.label = `${
curHour > 0
? (curHour < 10
? "0" + curHour
: curHour) + ":"
: ""
}${curMin < 10 ? "0" + curMin : curMin}:${curSec < 10 ? "0" + curSec : curSec}`;
} else {
self.label = `00:00`;
}