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

fix(ags bar workspace): make sure highlight is always in the right place

Browse source
This commit is contained in:
matt1432 2023-10-31 10:18:58 -04:00
parent 2af7237e5c
commit 4e53263c7b
1 changed files with 62 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
devices/wim/config/ags/js/bar/workspaces.js
View file

@ -1,5 +1,5 @@
import Hyprland from 'resource:///com/github/Aylur/ags/service/hyprland.js';
import { execAsync } from 'resource:///com/github/Aylur/ags/utils.js';
import { execAsync, timeout } from 'resource:///com/github/Aylur/ags/utils.js';
import { Box, Overlay, Revealer } from 'resource:///com/github/Aylur/ags/widget.js';
import EventBox from '../misc/cursorbox.js';
@ -28,25 +28,32 @@ const Workspace = ({ i } = {}) =>
}),
});
export default () => Overlay({
export default () => {
const updateHighlight = () => {
const currentId = Hyprland.active.workspace.id;
const indicators = highlight.get_parent().get_children()[0].child.children;
const currentIndex = indicators.findIndex(w => w._id == currentId);
if (currentIndex < 0)
return;
highlight.setStyle(`margin-left: ${16 + currentIndex * 30}px`);
};
const highlight = Box({
valign: 'center',
halign: 'start',
className: 'button active',
connections: [[Hyprland.active.workspace, updateHighlight]],
});
const widget = Overlay({
setup: self => {
self.set_overlay_pass_through(
self.get_children()[1],
true,
);
},
overlays: [Box({
valign: 'center',
halign: 'start',
className: 'button active',
connections: [[Hyprland.active.workspace, self => {
const currentId = Hyprland.active.workspace.id;
const indicators = self.get_parent().get_children()[0].child.children;
const currentIndex = indicators.findIndex(w => w._id == currentId);
self.setStyle(`margin-left: ${16 + currentIndex * 30}px`);
}]],
})],
overlays: [highlight],
child: EventBox({
child: Box({
className: 'workspaces',
@ -81,7 +88,13 @@ export default () => Overlay({
self._updateWorkspaces(self);
self._refresh(self);
// Make sure the highlight doesn't go too far
timeout(10, updateHighlight);
}]],
}),
}),
});
return widget;
};