matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(ags bar): use right getters for workspace widget
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-12-30 10:17:07 -05:00
parent 179e402504
commit 42bd408a76
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/ags/config/widgets/bar/items/workspaces.tsx
View file

@ -43,12 +43,12 @@ const Workspace = ({ id = 0 }) => {
} }
const isUrgent = client && const isUrgent = client &&
client.get_workspace().get_id() === id; client.get_workspace().get_id() === id;
if (isUrgent) { if (isUrgent) {
self.toggleClassName('urgent', true); self.toggleClassName('urgent', true);
// Only show for a sec when urgent is current workspace // Only show for a sec when urgent is current workspace
if (hyprland.get_focused_workspace().get_id() === id) { if (hyprland.get_focused_workspace().get_id() === id) {
timeout(URGENT_DURATION, () => { timeout(URGENT_DURATION, () => {
self.toggleClassName('urgent', false); self.toggleClassName('urgent', false);
@ -61,7 +61,7 @@ const Workspace = ({ id = 0 }) => {
self self
.hook(hyprland, 'event', () => update(self)) .hook(hyprland, 'event', () => update(self))
// Deal with urgent windows // Deal with urgent windows
.hook(hyprland, 'urgent', update) .hook(hyprland, 'urgent', update)
.hook(hyprland, 'notify::focused-workspace', () => { .hook(hyprland, 'notify::focused-workspace', () => {
@ -86,10 +86,10 @@ export default () => {
const currentId = Hyprland.get_focused_workspace().get_id().toString(); const currentId = Hyprland.get_focused_workspace().get_id().toString();
const indicators = ((self.get_parent() as Widget.Overlay) const indicators = ((self.get_parent() as Widget.Overlay)
.child as Widget.Box) .get_child() as Widget.Box)
.children as Widget.Revealer[]; .get_children() as Widget.Revealer[];
const currentIndex = indicators.findIndex((w) => w.get_name() === currentId); const currentIndex = indicators.findIndex((w) => w.name === currentId);
if (currentIndex >= 0) { if (currentIndex >= 0) {
self.set_css(`margin-left: ${L_PADDING + (currentIndex * WS_WIDTH)}px`); self.set_css(`margin-left: ${L_PADDING + (currentIndex * WS_WIDTH)}px`);
@ -135,7 +135,7 @@ export default () => {
const updateWorkspaces = () => { const updateWorkspaces = () => {
Hyprland.get_workspaces().forEach((ws) => { Hyprland.get_workspaces().forEach((ws) => {
const currentWs = (self.get_children() as Widget.Revealer[]) const currentWs = (self.get_children() as Widget.Revealer[])
.find((ch) => ch.get_name() === ws.get_id().toString()); .find((ch) => ch.name === ws.get_id().toString());
if (!currentWs && ws.get_id() > 0) { if (!currentWs && ws.get_id() > 0) {
self.add(Workspace({ id: ws.get_id() })); self.add(Workspace({ id: ws.get_id() }));
@ -144,7 +144,8 @@ export default () => {
// Make sure the order is correct // Make sure the order is correct
workspaces.forEach((workspace, i) => { workspaces.forEach((workspace, i) => {
(workspace.get_parent() as Widget.Box).reorder_child(workspace, i); (workspace.get_parent() as Widget.Box)
.reorder_child(workspace, i);
}); });
}; };
@ -152,11 +153,10 @@ export default () => {
workspaces = (self.get_children() as Widget.Revealer[]) workspaces = (self.get_children() as Widget.Revealer[])
.filter((ch) => { .filter((ch) => {
return Hyprland.get_workspaces().find((ws) => { return Hyprland.get_workspaces().find((ws) => {
return ws.get_id().toString() === ch.get_name(); return ws.get_id().toString() === ch.name;
}); });
}) })
.sort((a, b) => .sort((a, b) => parseInt(a.name ?? '0') - parseInt(b.name ?? '0'));
parseInt(a.get_name() ?? '0') - parseInt(b.get_name() ?? '0'));
updateWorkspaces(); updateWorkspaces();
refresh(); refresh();