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

Bar now properly hides if all sections are empty. (#467)

Browse Source
This commit is contained in:
Jas Singh
2024-11-09 13:09:48 -08:00
committed by GitHub
parent c150bc189d
commit 6120777b19
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/bar/Bar.ts
View File

@@ -33,7 +33,7 @@ import Button from 'types/widgets/button.js';
import Gtk from 'types/@girs/gtk-3.0/gtk-3.0.js';
import './SideEffects';
import { WindowLayer } from 'lib/types/options.js';
import { BarLayout, WindowLayer } from 'lib/types/options.js';
import { Attribute, Child } from 'lib/types/widget.js';
import Window from 'types/widgets/window.js';
@@ -72,10 +72,6 @@ type Layout = {
right: Section[];
};
type BarLayout = {
[key: string]: Layout;
};
const getLayoutForMonitor = (monitor: number, layouts: BarLayout): Layout => {
const matchingKey = Object.keys(layouts).find((key) => key === monitor.toString());
const wildcard = Object.keys(layouts).find((key) => key === '*');
@@ -95,6 +91,14 @@ const getLayoutForMonitor = (monitor: number, layouts: BarLayout): Layout => {
};
};
const isLayoutEmpty = (layout: Layout): boolean => {
const isLeftSectionEmpty = !Array.isArray(layout.left) || layout.left.length === 0;
const isRightSectionEmpty = !Array.isArray(layout.right) || layout.right.length === 0;
const isMiddleSectionEmpty = !Array.isArray(layout.middle) || layout.middle.length === 0;
return isLeftSectionEmpty && isRightSectionEmpty && isMiddleSectionEmpty;
};
const widget = {
battery: (): Button<Child, Attribute> => WidgetContainer(BatteryLabel()),
dashboard: (): Button<Child, Attribute> => WidgetContainer(Menu()),
@@ -259,7 +263,10 @@ export const Bar = (() => {
name: `bar-${hyprlandMonitor}`,
class_name: 'bar',
monitor,
visible: true,
visible: layouts.bind('value').as(() => {
const foundLayout = getLayoutForMonitor(hyprlandMonitor, layouts.value);
return !isLayoutEmpty(foundLayout);
}),
anchor: location.bind('value').as((ln) => [ln, 'left', 'right']),
exclusivity: 'exclusive',
layer: Utils.merge(
@@ -283,7 +290,7 @@ export const Bar = (() => {
hexpand: true,
setup: (self) => {
self.hook(layouts, (self) => {
const foundLayout = getLayoutForMonitor(hyprlandMonitor, layouts.value as BarLayout);
const foundLayout = getLayoutForMonitor(hyprlandMonitor, layouts.value);
self.children = foundLayout.left
.filter((mod) => Object.keys(widget).includes(mod))
.map((w) => widget[w](hyprlandMonitor) as Button<Gtk.Widget, unknown>);
@@ -295,7 +302,7 @@ export const Bar = (() => {
hpack: 'center',
setup: (self) => {
self.hook(layouts, (self) => {
const foundLayout = getLayoutForMonitor(hyprlandMonitor, layouts.value as BarLayout);
const foundLayout = getLayoutForMonitor(hyprlandMonitor, layouts.value);
self.children = foundLayout.middle
.filter((mod) => Object.keys(widget).includes(mod))
.map((w) => widget[w](hyprlandMonitor) as Button<Gtk.Widget, unknown>);
@@ -307,7 +314,7 @@ export const Bar = (() => {
hpack: 'end',
setup: (self) => {
self.hook(layouts, (self) => {
const foundLayout = getLayoutForMonitor(hyprlandMonitor, layouts.value as BarLayout);
const foundLayout = getLayoutForMonitor(hyprlandMonitor, layouts.value);
self.children = foundLayout.right
.filter((mod) => Object.keys(widget).includes(mod))
.map((w) => widget[w](hyprlandMonitor) as Button<Gtk.Widget, unknown>);