Added a reset buttn to the floating windows preferece page

Author: juarezr

lib/prefs/floating.js

@@ -6,23 +6,9 @@ import GObject from "gi://GObject";
 import { gettext as _ } from "resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js";
 
 // Extension imports
-import { PreferencesPage, RemoveItemRow } from "./widgets.js";
+import { PreferencesPage, RemoveItemRow, ResetButton } from "./widgets.js";
 import { ConfigManager } from "../shared/settings.js";
 
-function showAddWindow() {
-  console.log("Add window functionality not implemented yet");
-}
-
-function makeAddButton() {
-  const button = new Gtk.Button({
-    icon_name: "tab-new-symbolic",
-    tooltip_text: _("Add Window"),
-    valign: Gtk.Align.CENTER,
-  });
-  button.connect("clicked", () => showAddWindow());
-  return button;
-}
-
 export class FloatingPage extends PreferencesPage {
   static {
     GObject.registerClass(this);
@@ -33,30 +19,36 @@ export class FloatingPage extends PreferencesPage {
 
     this.settings = settings;
     this.configMgr = new ConfigManager({ dir });
+
     let overrides = this.configMgr.windowProps.overrides;
+    this.rows = this.loadItemsFromConfig(overrides);
+
+    this.floatingWindowGroup = this.add_group({
+      title: _("Floating Windows"),
+      description: _("Windows that will not be tiled"),
+      header_suffix: new ResetButton({ onReset: () => this.onResetHandler() }),
+      children: this.rows,
+    });
+  }
+
+  loadItemsFromConfig(overrides) {
     let children = [];
-    for (let index in overrides) {
-      let override = overrides[index];
+    for (let override of overrides) {
       if (override.mode === "float") {
         let itemrow = new RemoveItemRow({
           title: override.wmTitle ?? override.wmClass,
           subtitle: override.wmClass,
-          onRemove: this.onRemoveHandler,
+          onRemove: (item, parent) => this.onRemoveHandler(item, parent),
         });
         children.push(itemrow);
       }
     }
-
-    this.add_group({
-      title: _("Floating Windows"),
-      description: _("Windows that will not be tiled"),
-      header_suffix: makeAddButton(),
-      children: children,
-    });
+    return children;
   }
 
   onRemoveHandler(item, parent) {
-    parent.hide();
+    this.floatingWindowGroup.remove(parent);
+    this.rows = this.rows.filter((row) => row != parent);
     const existing = this.configMgr.windowProps.overrides;
     const modified = existing.filter((row) => item != row.wmClass);
     this.saveOverrides(modified);
@@ -72,4 +64,19 @@ export class FloatingPage extends PreferencesPage {
       this.settings.set_uint("window-overrides-reload-trigger", changed);
     }
   }
+
+  onResetHandler() {
+    const defaultWindowProps = this.configMgr.loadDefaultWindowConfigContents();
+    const original = defaultWindowProps.overrides;
+    this.saveOverrides(original);
+
+    for (const child of this.rows) {
+      this.floatingWindowGroup.remove(child);
+    }
+
+    this.rows = this.loadItemsFromConfig(original);
+    for (const item of this.rows) {
+      this.floatingWindowGroup.add(item);
+    }
+  }
 }

lib/prefs/widgets.js

@@ -22,6 +22,7 @@ export class PreferencesPage extends Adw.PreferencesPage {
     for (const child of children) group.add(child);
     if (header_suffix) group.set_header_suffix(header_suffix);
     this.add(group);
+    return group;
   }
 }
 

lib/shared/settings.js

@@ -51,7 +51,6 @@ export class ConfigManager extends GObject.Object {
     if (defaultStylesheetFile.query_exists(null)) {
       return defaultStylesheetFile;
     }
-
     return null;
   }
 
@@ -75,7 +74,17 @@ export class ConfigManager extends GObject.Object {
     if (defaultWindowConfigFile.query_exists(null)) {
       return defaultWindowConfigFile;
     }
+    return null;
+  }
 
+  loadDefaultWindowConfigContents() {
+    const defaultSettingFile = this.defaultWindowConfigFile;
+    if (defaultSettingFile) {
+      const contents = this.loadFileContents(defaultSettingFile);
+      if (contents) {
+        return JSON.parse(contents);
+      }
+    }
     return null;
   }
 
@@ -119,7 +128,8 @@ export class ConfigManager extends GObject.Object {
   get windowProps() {
     let windowConfigFile = this.windowConfigFile;
     let windowProps = null;
-    if (!windowConfigFile || !production) {
+    // if (!windowConfigFile || !production) {
+    if (!windowConfigFile) {
       windowConfigFile = this.defaultWindowConfigFile;
     }
 
@@ -134,7 +144,8 @@ export class ConfigManager extends GObject.Object {
 
   set windowProps(props) {
     let windowConfigFile = this.windowConfigFile;
-    if (!windowConfigFile || !production) {
+    // if (!windowConfigFile || !production) {
+    if (!windowConfigFile) {
       windowConfigFile = this.defaultWindowConfigFile;
     }