Quit Workbench when the last open window is closed

Fixes #727

Author: sonnyp

src/Library/Library.js

@@ -5,6 +5,7 @@ import {
   demos_dir,
   getLanguage,
   settings as global_settings,
+  quitOnLastWindowClose,
 } from "../util.js";
 import Window from "../window.js";
 
@@ -24,6 +25,8 @@ export default function Library({ application }) {
 
   let last_selected;
 
+  window.connect("close-request", quitOnLastWindowClose);
+
   const demos = getDemos();
   demos.forEach((demo) => {
     const widget = new EntryRow({ demo: demo });

src/shortcutsWindow.js

@@ -15,7 +15,6 @@ export default function ShortcutsWindow({ application }) {
     if (!window) {
       ({ window } = build(resource));
       window.set_transient_for(application.get_active_window());
-      window.set_application(application);
     }
     window.present();
   });

src/util.js

@@ -197,3 +197,17 @@ export function buildRuntimePath(...args) {
     ...args,
   ]);
 }
+
+export function quitOnLastWindowClose(self) {
+  const { application } = self;
+  const application_windows = [...application.get_windows()];
+  const is_last_window_open = application_windows
+    .filter((w) => w !== self)
+    .every((w) => !w.get_mapped());
+
+  if (is_last_window_open) {
+    application.quit();
+  }
+
+  return false;
+}

src/window.js

@@ -6,7 +6,7 @@ import Adw from "gi://Adw";
 import Vte from "gi://Vte";
 
 import * as xml from "./langs/xml/xml.js";
-import { buildRuntimePath, languages } from "./util.js";
+import { buildRuntimePath, languages, quitOnLastWindowClose } from "./util.js";
 import Document from "./Document.js";
 import PanelUI from "./PanelUI.js";
 import PanelCode from "./PanelCode.js";
@@ -508,18 +508,34 @@ async function setGtk4PreferDark(dark) {
   settings.save_to_file(settings_path);
 }
 
+function close(window) {
+  quitOnLastWindowClose(window);
+  window.destroy();
+}
+
 async function onCloseSession({ session, window }) {
   if (session.isProject()) {
-    window.destroy();
-    return;
+    return close(window);
   }
 
   if (!session.settings.get_boolean("edited")) {
     await deleteSession(session);
-    window.destroy();
-    return;
+    return close(window);
   }
 
+  const [response, location] = await promptSessionClose({ window });
+  if (response === "cancel") return;
+
+  if (response === "discard") {
+    await deleteSession(session);
+  } else if (response === "save") {
+    await saveSessionAsProject(session, location);
+  }
+
+  close(window);
+}
+
+async function promptSessionClose({ window }) {
   const builder = Gtk.Builder.new_from_resource(resource);
   const dialog = builder.get_object("message_dialog_save_project");
 
@@ -561,16 +577,8 @@ async function onCloseSession({ session, window }) {
   }
 
   const response = await dialog.choose(null);
-  if (response === "cancel") return;
-
-  if (response === "discard") {
-    await deleteSession(session);
-  } else if (response === "save") {
-    const destination = location.get_child_for_display_name(
-      row_project_name.text,
-    );
-    await saveSessionAsProject(session, destination);
-  }
-
-  window.destroy();
+  return [
+    response,
+    location?.get_child_for_display_name(row_project_name.text),
+  ];
 }