✨ ags(apps-window, control-center, center-window): port to new PopupWindow function

ags/window/AppsWindow.ts

@@ -2,7 +2,7 @@ import { GObject, Variable } from "astal";
 import { Astal, Gdk, Gtk, Widget } from "astal/gtk3";
 import { cleanExec, getAppIcon, getApps, getAstalApps } from "../scripts/apps";
 import AstalApps from "gi://AstalApps";
-import { BackgroundWindow } from "../widget/BackgroundWindow";
+import { PopupWindow } from "../widget/PopupWindow";
 
 const { TOP, LEFT, RIGHT, BOTTOM } = Astal.WindowAnchor;
 
@@ -106,18 +106,15 @@ export const AppsWindow = (mon: number): (Widget.Window) => {
         return button;
     }
 
-    const bgWindow = BackgroundWindow(null, () => window.close(), () => window.close());
+    const window = PopupWindow({
-
-    const window = new Widget.Window({
         namespace: "apps-window",
         layer: Astal.Layer.OVERLAY,
         exclusivity: Astal.Exclusivity.IGNORE,
         anchor: TOP | LEFT | RIGHT | BOTTOM,
-        keymode: Astal.Keymode.EXCLUSIVE,
         monitor: mon,
+        cssBackgroundWindow: "background: rgba(0, 0, 0, .2)",
         marginTop: 64,
         onDestroy: () => {
-            bgWindow.close();
             searchSubscription?.();
             flowboxConnections.map(id => flowbox.disconnect(id));
         },

ags/window/CenterWindow.ts

@@ -1,4 +1,4 @@
-import { Gtk, Widget } from "astal/gtk3";
+import { Astal, Gtk, Widget } from "astal/gtk3";
 import { bind, GLib } from "astal";
 
 import { getDateTime } from "../scripts/time";
@@ -8,12 +8,12 @@ import { BigMedia } from "../widget/center-window/BigMedia";
 import AstalMpris from "gi://AstalMpris?version=0.1";
 
 export const CenterWindow = (mon: number) => PopupWindow({
-    className: "center-window-container",
     namespace: "center-window",
     marginTop: 10,
-    valign: Gtk.Align.START,
+    anchor: Astal.WindowAnchor.TOP,
-    halign: Gtk.Align.CENTER,
     monitor: mon,
+    child: new Widget.Box({
+        className: "center-window-container",
         children: [
             new Widget.Box({
                 className: "vertical left",
@@ -74,4 +74,5 @@ export const CenterWindow = (mon: number) => PopupWindow({
                 } as Widget.BoxProps)
             } as Widget.RevealerProps)
         ]
+    } as Widget.BoxProps)
 } as PopupWindowProps);

ags/window/ControlCenter.ts

@@ -1,55 +1,33 @@
-import { Astal, Gdk, Gtk, Widget } from "astal/gtk3";
+import { Astal, Gtk, Widget } from "astal/gtk3";
 import { QuickActions } from "../widget/control-center/QuickActions";
 import { Tiles } from "../widget/control-center/Tiles";
 import { Sliders } from "../widget/control-center/Sliders";
 import { hidePages, PagesWidget } from "../widget/control-center/Pages";
 import { NotifHistory } from "../widget/control-center/NotifHistory";
-import { Windows } from "../windows";
+import { PopupWindow } from "../widget/PopupWindow";
 
-const { TOP, LEFT, BOTTOM, RIGHT } = Astal.WindowAnchor;
 
-export const ControlCenter = (mon: number) => new Widget.Window({
+export const ControlCenter = (mon: number) => PopupWindow({
     namespace: "control-center",
     className: "control-center",
-    anchor: TOP | BOTTOM | LEFT | RIGHT,
     exclusivity: Astal.Exclusivity.NORMAL,
-    keymode: Astal.Keymode.EXCLUSIVE,
+    anchor: Astal.WindowAnchor.TOP | Astal.WindowAnchor.RIGHT | Astal.WindowAnchor.BOTTOM,
     layer: Astal.Layer.OVERLAY,
     focusOnMap: true,
+    marginTop: 10,
+    marginRight: 10,
     monitor: mon,
-    onDestroy: () => {
+    onDestroy: () => hidePages(),
-        hidePages();
+    widthRequest: 420,
-    },
-    onButtonPressEvent: (_, event: Gdk.Event) => {
-        const [, posX, posY] = event.get_coords();
-        const childAllocation = _.get_child()!.get_allocation();
-
-        if((posX < childAllocation.x || posX > (childAllocation.x + childAllocation.width)) || 
-           (posY < childAllocation.y || posY > (childAllocation.y + childAllocation.height))) {
-            Windows.close("control-center");
-            hidePages();
-        }
-    },
-    onKeyPressEvent: (_, event: Gdk.Event) => {
-        if(event.get_keyval()[1] === Gdk.KEY_Escape) {
-            Windows.close("control-center");
-            hidePages();
-        }
-    },
     child: new Widget.Box({
         className: "popup",
         halign: Gtk.Align.END,
-        css: `margin-top: 10px;
-              margin-right: 10px;
-              margin-bottom: 10px;`,
-        widthRequest: 420,
         onButtonPressEvent: () => true,
         orientation: Gtk.Orientation.VERTICAL,
         children: [
             new Widget.Box({
                 className: "control-center-container",
                 orientation: Gtk.Orientation.VERTICAL,
-                widthRequest: 400,
                 vexpand: false,
                 children: [
                     QuickActions(),