This commit is contained in:
end-4
2024-04-18 19:06:52 +07:00
parent 8ae019fde7
commit f7d8d7b8ea
+11 -23
View File
@@ -63,8 +63,7 @@ const DockSeparator = (props = {}) => Box({
className: 'dock-separator', className: 'dock-separator',
}) })
const PinButton = () => { const PinButton = () => Widget.Button({
let botton = Widget.Button({
className: 'dock-app-btn dock-app-btn-animate', className: 'dock-app-btn dock-app-btn-animate',
tooltipText: 'Pin Dock', tooltipText: 'Pin Dock',
child: Widget.Overlay({ child: Widget.Overlay({
@@ -79,18 +78,13 @@ const PinButton = () => {
hpack: 'center', hpack: 'center',
})], })],
}), }),
onClicked: () => { onClicked: (self) => {
isPinned = !isPinned isPinned = !isPinned
botton.className = `${isPinned ? "pinned-dock-app-btn" : "dock-app-btn animate"} dock-app-btn-animate` self.className = `${isPinned ? "pinned-dock-app-btn" : "dock-app-btn animate"} dock-app-btn-animate`
}, },
setup: (button) => { setup: setupCursorHover,
setupCursorHover(button);
}
}) })
return botton
}
const AppButton = ({ icon, ...rest }) => Widget.Revealer({ const AppButton = ({ icon, ...rest }) => Widget.Revealer({
attribute: { attribute: {
'workspace': 0 'workspace': 0
@@ -299,11 +293,10 @@ export default (monitor = 0) => {
// self.revealChild = true; // self.revealChild = true;
// // } // // }
if (userOptions.dock.monitorExclusivity) { if (userOptions.dock.monitorExclusivity)
self.revealChild = Hyprland.active.monitor.id === monitor self.revealChild = Hyprland.active.monitor.id === monitor;
} else { else
self.revealChild = true; self.revealChild = true;
}
return self.revealChild return self.revealChild
} }
@@ -317,11 +310,9 @@ export default (monitor = 0) => {
if (!userOptions.dock.trigger.includes(trigger)) return if (!userOptions.dock.trigger.includes(trigger)) return
const flag = self.attribute.updateShow(self) const flag = self.attribute.updateShow(self)
if (flag) { clearTimes() } if (flag) clearTimes();
const hidden = userOptions const hidden = userOptions.dock.autoHide.find(e => e["trigger"] === trigger)
.dock
.autoHide.find(e => e["trigger"] === trigger)
if (hidden) { if (hidden) {
let id = Utils.timeout(hidden.interval, () => { let id = Utils.timeout(hidden.interval, () => {
@@ -338,8 +329,7 @@ export default (monitor = 0) => {
.hook(Hyprland.active.client, self => callback(self, "client-active")) .hook(Hyprland.active.client, self => callback(self, "client-active"))
.hook(Hyprland, self => callback(self, "client-added"), "client-added") .hook(Hyprland, self => callback(self, "client-added"), "client-added")
.hook(Hyprland, self => callback(self, "client-removed"), "client-removed") .hook(Hyprland, self => callback(self, "client-removed"), "client-removed")
} },
,
}) })
return EventBox({ return EventBox({
onHover: () => { onHover: () => {
@@ -349,9 +339,7 @@ export default (monitor = 0) => {
child: Box({ child: Box({
homogeneous: true, homogeneous: true,
css: `min-height: ${userOptions.dock.hiddenThickness}px;`, css: `min-height: ${userOptions.dock.hiddenThickness}px;`,
children: [ children: [dockRevealer],
dockRevealer,
]
}), }),
setup: self => self.on("leave-notify-event", () => { setup: self => self.on("leave-notify-event", () => {
if (!isPinned) dockRevealer.revealChild = false; if (!isPinned) dockRevealer.revealChild = false;