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

Fixed bug that would cause icon based workspaces indicator to not update properly.

Browse Source
This commit is contained in:
Jas Singh
2024-07-25 01:34:53 -07:00
parent 5fe033fe79
commit aedb112a5c
1 changed files with 117 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

233
modules/bar/workspaces/index.js
View File

@@ -4,129 +4,130 @@ import options from "options";
const { workspaces, monitorSpecific } = options.bar.workspaces;
function range(length, start = 1) {
return Array.from({ length }, (_, i) => i + start);
return Array.from({ length }, (_, i) => i + start);
}
const Workspaces = (monitor = -1, ws = 8) => {
const getWorkspacesForMonitor = (curWs, wsRules) => {
if (!wsRules || !Object.keys(wsRules).length) {
return true;
}
const monitorMap = {};
hyprland.monitors.forEach((m) => (monitorMap[m.id] = m.name));
const currentMonitorName = monitorMap[monitor];
return wsRules[currentMonitorName].includes(curWs);
};
const getWorkspaceRules = () => {
try {
const rules = Utils.exec("hyprctl workspacerules -j");
const workspaceRules = {};
JSON.parse(rules).forEach((rule, index) => {
if (Object.hasOwnProperty.call(workspaceRules, rule.monitor)) {
workspaceRules[rule.monitor].push(index + 1);
} else {
workspaceRules[rule.monitor] = [index + 1];
const getWorkspacesForMonitor = (curWs, wsRules) => {
if (!wsRules || !Object.keys(wsRules).length) {
return true;
}
});
return workspaceRules;
} catch (err) {
console.error(err);
}
};
const monitorMap = {};
hyprland.monitors.forEach((m) => (monitorMap[m.id] = m.name));
return {
component: Widget.Box({
class_name: "workspaces",
children: Utils.merge(
[workspaces.bind(), monitorSpecific.bind()],
(workspaces, monitorSpecific) => {
return range(workspaces || 8)
.filter((i) => {
if (!monitorSpecific) {
return true;
}
const workspaceRules = getWorkspaceRules();
return getWorkspacesForMonitor(i, workspaceRules);
})
.map((i) => {
return Widget.Label({
attribute: i,
vpack: "center",
class_name: Utils.merge(
[
options.bar.workspaces.show_icons.bind("value"),
options.bar.workspaces.icons.available.bind("value"),
options.bar.workspaces.icons.active.bind("value"),
options.bar.workspaces.icons.occupied.bind("value"),
],
(show_icons) => {
if (show_icons) {
return `workspace-icon`;
}
return "";
},
),
label: Utils.merge(
[
options.bar.workspaces.show_icons.bind("value"),
options.bar.workspaces.icons.available.bind("value"),
options.bar.workspaces.icons.active.bind("value"),
options.bar.workspaces.icons.occupied.bind("value"),
],
(showIcons, available, active, occupied) => {
if (showIcons) {
if (hyprland.active.workspace.id === i) {
return active;
}
if ((hyprland.getWorkspace(i)?.windows || 0) > 0) {
return occupied;
}
if (
monitor !== -1 &&
hyprland.getWorkspace(i)?.monitorID !== monitor
) {
return available;
}
}
return `${i}`;
},
),
setup: (self) => {
self.hook(hyprland, () => {
self.toggleClassName(
"active",
hyprland.active.workspace.id === i,
);
self.toggleClassName(
"occupied",
(hyprland.getWorkspace(i)?.windows || 0) > 0,
);
});
},
});
const currentMonitorName = monitorMap[monitor];
return wsRules[currentMonitorName].includes(curWs);
};
const getWorkspaceRules = () => {
try {
const rules = Utils.exec("hyprctl workspacerules -j");
const workspaceRules = {};
JSON.parse(rules).forEach((rule, index) => {
if (Object.hasOwnProperty.call(workspaceRules, rule.monitor)) {
workspaceRules[rule.monitor].push(index + 1);
} else {
workspaceRules[rule.monitor] = [index + 1];
}
});
},
),
setup: (box) => {
if (ws === 0) {
box.hook(hyprland.active.workspace, () =>
box.children.map((btn) => {
btn.visible = hyprland.workspaces.some(
(ws) => ws.id === btn.attribute,
);
}),
);
return workspaceRules;
} catch (err) {
console.error(err);
}
},
}),
isVisible: true,
boxClass: "workspaces",
};
};
return {
component: Widget.Box({
class_name: "workspaces",
children: Utils.merge(
[workspaces.bind(), monitorSpecific.bind()],
(workspaces, monitorSpecific) => {
return range(workspaces || 8)
.filter((i) => {
if (!monitorSpecific) {
return true;
}
const workspaceRules = getWorkspaceRules();
return getWorkspacesForMonitor(i, workspaceRules);
})
.map((i) => {
return Widget.Label({
attribute: i,
vpack: "center",
class_name: Utils.merge(
[
options.bar.workspaces.show_icons.bind("value"),
options.bar.workspaces.icons.available.bind("value"),
options.bar.workspaces.icons.active.bind("value"),
options.bar.workspaces.icons.occupied.bind("value"),
hyprland.active.workspace.bind("id")
],
(show_icons) => {
if (show_icons) {
return `workspace-icon`;
}
return "";
},
),
label: Utils.merge(
[
options.bar.workspaces.show_icons.bind("value"),
options.bar.workspaces.icons.available.bind("value"),
options.bar.workspaces.icons.active.bind("value"),
options.bar.workspaces.icons.occupied.bind("value"),
hyprland.active.workspace.bind("id")
],
(showIcons, available, active, occupied, _) => {
if (showIcons) {
if (hyprland.active.workspace.id === i) {
return active;
}
if ((hyprland.getWorkspace(i)?.windows || 0) > 0) {
return occupied;
}
if (
monitor !== -1
) {
return available;
}
}
return `${i}`;
},
),
setup: (self) => {
self.hook(hyprland, () => {
self.toggleClassName(
"active",
hyprland.active.workspace.id === i,
);
self.toggleClassName(
"occupied",
(hyprland.getWorkspace(i)?.windows || 0) > 0,
);
});
},
});
});
},
),
setup: (box) => {
if (ws === 0) {
box.hook(hyprland.active.workspace, () =>
box.children.map((btn) => {
btn.visible = hyprland.workspaces.some(
(ws) => ws.id === btn.attribute,
);
}),
);
}
},
}),
isVisible: true,
boxClass: "workspaces",
};
};
export { Workspaces };