Olivier/colorshell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔧 chore(app, windows): create app scope disposed on app ::shutdown, delete WindowInstance object from WindowData instead of defining as undefined

Browse Source
This commit is contained in:
retrozinndev
2025-07-26 16:02:33 -03:00
parent e25c2339ab
commit 3d64b7e144
2 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ags/windows.ts
+21 -20
View File
@@ -12,6 +12,7 @@ import GObject, { getter, register, signal } from "ags/gobject";
import AstalHyprland from "gi://AstalHyprland";
import { Scope } from "../../../../usr/share/ags/js/gnim/src/jsx/scope";
import { appScope } from "./app";
export { Windows };
@@ -60,25 +61,16 @@ class Windows extends GObject.Object {
constructor() {
super();
createRoot((_) => {
// Listen to monitor events
const hyprConnections = [
AstalHyprland.get_default().connect("monitor-added", () =>
this.reopen()),
AstalHyprland.get_default().connect("monitor-removed", () =>
AstalHyprland.get_default().get_monitors().length > 0 &&
this.reopen())
];
onCleanup(() => {
hyprConnections.forEach(id =>
GObject.signal_handler_is_connected(AstalHyprland.get_default(), id) &&
AstalHyprland.get_default().disconnect(id)
);
this.openWindows.forEach(name => this.disconnectWindow(name));
});
// Listen to monitor events
const hyprConnections = [
AstalHyprland.get_default().connect("monitor-added", () =>
this.reopen()),
AstalHyprland.get_default().connect("monitor-removed", () =>
AstalHyprland.get_default().get_monitors().length > 0 &&
this.reopen())
];
appScope.run(() => {
// open windows with the "open" status on startup
Object.keys(this.#windows).filter((key) =>
this.#windows[key].status === "open"
@@ -87,6 +79,15 @@ class Windows extends GObject.Object {
console.log(`Windows: opening window \`${name}\` on startup`);
});
});
onCleanup(() => {
hyprConnections.forEach(id =>
GObject.signal_handler_is_connected(AstalHyprland.get_default(), id) &&
AstalHyprland.get_default().disconnect(id)
);
this.openWindows.forEach(name => this.disconnectWindow(name));
});
}
private disconnectWindow(name: string) {
@@ -157,7 +158,7 @@ class Windows extends GObject.Object {
window.instance.forEach(inst => inst.connections = [
inst.instance!.connect("close-request", () => {
this.disconnectWindow(name);
inst.instance = undefined;
delete window.instance;
window.status = "closed";
this.notify("open-windows");
})
@@ -169,7 +170,7 @@ class Windows extends GObject.Object {
window.instance.connections = [
window.instance.instance!.connect("close-request", () => {
this.disconnectWindow(name);
(window.instance as WindowInstance).instance = undefined;
delete window.instance;
window.status = "closed";
this.notify("open-windows");
})