fix null not window error; don't add nulls when ternaries are wrong

This commit is contained in:
end-4
2024-04-29 18:59:06 +07:00
parent f180aa56eb
commit f26c26ff8e
3 changed files with 12 additions and 11 deletions
+2 -1
View File
@@ -46,6 +46,7 @@ applyStyle().catch(print);
const Windows = () => [
// forMonitors(DesktopBackground),
Overview(),
forMonitors(Indicator),
forMonitors(Cheatsheet),
@@ -53,7 +54,7 @@ const Windows = () => [
SideRight(),
forMonitors(Osk),
forMonitors(Session),
userOptions.dock.enabled ? forMonitors(Dock) : null,
...(userOptions.dock.enabled ? [forMonitors(Dock)] : []),
...(userOptions.appearance.fakeScreenRounding ? [
forMonitors((id) => Corner(id, 'top left', true)),
forMonitors((id) => Corner(id, 'top right', true)),
@@ -50,12 +50,12 @@ export const ConfigToggle = ({
tooltipText: desc,
className: 'txt spacing-h-5 configtoggle-box',
children: [
(icon !== undefined ? MaterialIcon(icon, 'norm') : null),
(name !== undefined ? Label({
...(icon !== undefined ? [MaterialIcon(icon, 'norm')] : []),
...(name !== undefined ? [Label({
className: 'txt txt-small',
label: name,
}) : null),
expandWidget ? Box({ hexpand: true }) : null,
})] : []),
...(expandWidget ? [Box({ hexpand: true })] : []),
toggleButton,
]
});
@@ -203,12 +203,12 @@ export const ConfigSpinButton = ({
tooltipText: desc,
className: 'txt spacing-h-5 configtoggle-box',
children: [
(icon !== undefined ? MaterialIcon(icon, 'norm') : null),
(name !== undefined ? Label({
...(icon !== undefined ? [MaterialIcon(icon, 'norm')] : []),
...(name !== undefined ? [Label({
className: 'txt txt-small',
label: name,
}) : null),
expandWidget ? Box({ hexpand: true }) : null,
})] : []),
...(expandWidget ? [Box({ hexpand: true })] : []),
spinButton,
],
setup: (self) => {
@@ -106,7 +106,7 @@ const BluetoothDevices = () => Widget.Box({
tooltipText: device.name,
children: [
Widget.Icon(`${device.iconName}-symbolic`),
(device.batteryPercentage ? Widget.Label({
...(device.batteryPercentage ? [Widget.Label({
className: 'txt-smallie',
label: `${device.batteryPercentage}`,
setup: (self) => {
@@ -114,7 +114,7 @@ const BluetoothDevices = () => Widget.Box({
self.label = `${device.batteryPercentage}`;
}, 'notify::batteryPercentage')
}
}) : null),
})] : []),
]
});
});