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

Made unoccupied workspaces setting more compaitble with # of workspaces assigned. (#192)

Browse Source 
* Made unoccupied workspaces setting more compaitble with # of workspaces assigned.

* Updated monitor listings

* Fix scenario where workspace rules aren't defined.

* Refactor for clean up and use workspace names instead of loop index.
This commit is contained in:
Jas Singh
2024-08-25 22:32:00 -07:00
committed by GitHub
parent cedf94ff41
commit fc2b781673
2 changed files with 69 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/bar/workspaces/helpers.ts
View File

@@ -16,7 +16,10 @@ export const getWorkspacesForMonitor = (curWs: number, wsRules: WorkspaceMap, mo
}
const monitorMap = {};
hyprland.monitors.forEach((m) => (monitorMap[m.id] = m.name));
const workspaceMonitorList = hyprland?.workspaces?.map(m => ({ id: m.monitorID, name: m.monitor }));
const monitors = [...new Map([...workspaceMonitorList, ...hyprland.monitors].map(item => [item.id, item])).values()];
monitors.forEach((m) => (monitorMap[m.id] = m.name));
const currentMonitorName = monitorMap[monitor];
const monitorWSRules = wsRules[currentMonitorName];
@@ -35,7 +38,10 @@ export const getWorkspaceRules = (): WorkspaceMap => {
JSON.parse(rules).forEach((rule: WorkspaceRule, index: number) => {
if (Object.hasOwnProperty.call(workspaceRules, rule.monitor)) {
workspaceRules[rule.monitor].push(index + 1);
const workspaceNum = parseInt(rule.workspaceString, 10);
if (!isNaN(workspaceNum)) {
workspaceRules[rule.monitor].push(workspaceNum);
}
} else {
workspaceRules[rule.monitor] = [index + 1];
}