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

support "*" as wildcard layout key (#252)

Browse Source 
allows specifing a default layout that applies for all monitors if no
more specific layout is found.
This commit is contained in:
Jonas
2024-09-14 21:13:49 +02:00
committed by GitHub
parent 0156d2d8c1
commit de50a01e21
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/bar/Bar.ts
View File

@@ -65,10 +65,19 @@ type BarLayout = {
[key: string]: Layout [key: string]: Layout
} }
const getModulesForMonitor = (monitor: number, curLayouts: BarLayout) => { const getLayoutForMonitor = (monitor: number, layouts: BarLayout): Layout => {
const foundMonitor = Object.keys(curLayouts).find(mon => mon === monitor.toString()); const matchingKey = Object.keys(layouts).find(key => key === monitor.toString());
const wildcard = Object.keys(layouts).find(key => key === "*");
const defaultSetup: Layout = { if (matchingKey) {
return layouts[matchingKey];
}
if (wildcard) {
return layouts[wildcard];
}
return {
left: [ left: [
"dashboard", "dashboard",
"workspaces", "workspaces",
@@ -86,14 +95,7 @@ const getModulesForMonitor = (monitor: number, curLayouts: BarLayout) => {
"clock", "clock",
"notifications" "notifications"
] ]
} };
if (foundMonitor === undefined) {
return defaultSetup;
}
return curLayouts[foundMonitor];
} }
const widget = { const widget = {
@@ -285,7 +287,7 @@ export const Bar = (() => {
hexpand: true, hexpand: true,
setup: self => { setup: self => {
self.hook(layouts, (self) => { self.hook(layouts, (self) => {
const foundLayout = getModulesForMonitor(hyprlandMonitor, layouts.value as BarLayout); const foundLayout = getLayoutForMonitor(hyprlandMonitor, layouts.value as BarLayout);
self.children = foundLayout.left.filter(mod => Object.keys(widget).includes(mod)).map(w => widget[w](hyprlandMonitor) as Button<Gtk.Widget, unknown>); self.children = foundLayout.left.filter(mod => Object.keys(widget).includes(mod)).map(w => widget[w](hyprlandMonitor) as Button<Gtk.Widget, unknown>);
}); });
}, },
@@ -295,7 +297,7 @@ export const Bar = (() => {
hpack: "center", hpack: "center",
setup: self => { setup: self => {
self.hook(layouts, (self) => { self.hook(layouts, (self) => {
const foundLayout = getModulesForMonitor(hyprlandMonitor, layouts.value as BarLayout); const foundLayout = getLayoutForMonitor(hyprlandMonitor, layouts.value as BarLayout);
self.children = foundLayout.middle.filter(mod => Object.keys(widget).includes(mod)).map(w => widget[w](hyprlandMonitor) as Button<Gtk.Widget, unknown>); self.children = foundLayout.middle.filter(mod => Object.keys(widget).includes(mod)).map(w => widget[w](hyprlandMonitor) as Button<Gtk.Widget, unknown>);
}); });
}, },
@@ -305,7 +307,7 @@ export const Bar = (() => {
hpack: "end", hpack: "end",
setup: self => { setup: self => {
self.hook(layouts, (self) => { self.hook(layouts, (self) => {
const foundLayout = getModulesForMonitor(hyprlandMonitor, layouts.value as BarLayout); const foundLayout = getLayoutForMonitor(hyprlandMonitor, layouts.value as BarLayout);
self.children = foundLayout.right.filter(mod => Object.keys(widget).includes(mod)).map(w => widget[w](hyprlandMonitor) as Button<Gtk.Widget, unknown>); self.children = foundLayout.right.filter(mod => Object.keys(widget).includes(mod)).map(w => widget[w](hyprlandMonitor) as Button<Gtk.Widget, unknown>);
}); });
}, },