StylusView: move settings here

elementary · Mar 13, 2024 · 2b3981c · 2b3981c
1 parent 9ae43c1
commit 2b3981c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/src/Backend/WacomTool.vala b/src/Backend/WacomTool.vala
@@ -24,11 +24,11 @@ public errordomain WacomException {
 public class Wacom.Backend.WacomTool : GLib.Object {
     public uint64 id { public get; construct; }
     public uint64 serial { public get; construct; }
-    public Backend.Device? device { get; construct; }
+    public string vendor_id { get; construct; }
+    public string product_id { get; construct; }
 
     public unowned Wacom.Stylus? stylus { get; private set; default = null; }
 
-    private GLib.Settings? settings = null;
     private static Wacom.DeviceDatabase? wacom_db = null;
 
     public WacomTool (uint64 serial, uint64 id, Backend.Device? device) throws WacomException {
@@ -49,29 +49,19 @@ public class Wacom.Backend.WacomTool : GLib.Object {
             }
         }
 
-        Object (id: id, serial: serial, device: device);
+        Object (
+            id: id,
+            serial: serial,
+            vendor_id: device.vendor_id,
+            product_id: device.product_id
+        );
     }
 
     construct {
-        stylus = wacom_db.get_stylus_for_id ((int)this.id);
+        stylus = wacom_db.get_stylus_for_id ((int) id);
 
         if (stylus == null) {
             throw new WacomException.LIBWACOM_ERROR ("Stylus description not found");
         }
-
-        string settings_path;
-        if (this.serial == 0) {
-            settings_path = "/org/gnome/desktop/peripherals/stylus/default-%s:%s/".printf (
-                device.vendor_id, device.product_id
-            );
-        } else {
-            settings_path = "/org/gnome/desktop/peripherals/stylus/%llx/".printf (this.serial);
-        }
-
-        settings = new GLib.Settings.with_path ("org.gnome.desktop.peripherals.tablet.stylus", settings_path);
-    }
-
-    public GLib.Settings get_settings () {
-        return settings;
     }
 }
diff --git a/src/Views/StylusView.vala b/src/Views/StylusView.vala
@@ -70,7 +70,16 @@ public class Wacom.StylusView : Gtk.Box {
 
         stylus_box.add (header_box);
 
-        settings = device.get_settings ();
+        string settings_path;
+        if (device.serial == 0) {
+            settings_path = "/org/gnome/desktop/peripherals/stylus/default-%s:%s/".printf (
+                device.vendor_id, device.product_id
+            );
+        } else {
+            settings_path = "/org/gnome/desktop/peripherals/stylus/%llx/".printf (device.serial);
+        }
+
+        settings = new Settings.with_path ("org.gnome.desktop.peripherals.tablet.stylus", settings_path);
 
         var has_pressure_detection = Wacom.AxisTypeFlags.PRESSURE in device.stylus.get_axes ();