Merge branch 'main' into leolost/window-list-model-full

Author: leolost2605

daemon/MonitorLabel.vala

@@ -31,8 +31,8 @@
         var provider = new Gtk.CssProvider ();
         try {
             provider.load_from_string (COLORED_STYLE_CSS.printf (title, info.background_color, info.text_color));
-            get_style_context ().add_class (title);
-            get_style_context ().add_class ("monitor-label");
+            add_css_class (title);
+            add_css_class ("monitor-label");
 
             Gtk.StyleContext.add_provider_for_display (
                 Gdk.Display.get_default (),

lib/Gestures/ActorTarget.vala

@@ -64,7 +64,7 @@ public class Gala.ActorTarget : Clutter.Actor, GestureTarget {
     public virtual void commit_progress (GestureAction action, double to) {}
     public virtual void end_progress (GestureAction action) {}
 
-    public override void propagate (UpdateType update_type, GestureAction action, double progress) {
+    public void propagate (UpdateType update_type, GestureAction action, double progress) {
         if (update_type == COMMIT) {
             current_commit[action] = progress;
         } else {

lib/Gestures/GestureSettings.vala

@@ -34,21 +34,6 @@ private class Gala.GestureSettings : Object {
             : touchpad_settings.get_boolean ("natural-scroll");
     }
 
-    public Meta.MotionDirection? get_direction (Gesture gesture) {
-        switch (gesture.direction) {
-            case GestureDirection.UP:
-                return Meta.MotionDirection.UP;
-            case GestureDirection.DOWN:
-                return Meta.MotionDirection.DOWN;
-            case GestureDirection.LEFT:
-                return Meta.MotionDirection.LEFT;
-            case GestureDirection.RIGHT:
-                return Meta.MotionDirection.RIGHT;
-            default:
-                return null;
-        }
-    }
-
     public Meta.MotionDirection? get_natural_scroll_direction (Gesture gesture) {
         bool natural_scroll = is_natural_scroll_enabled (gesture.performed_on_device_type);
 

lib/Gestures/GestureTarget.vala

@@ -13,5 +13,5 @@ public interface Gala.GestureTarget : Object {
         END
     }
 
-    public virtual void propagate (UpdateType update_type, GestureAction action, double progress) { }
+    public abstract void propagate (UpdateType update_type, GestureAction action, double progress);
 }

lib/Gestures/PropertyTarget.vala

@@ -30,7 +30,7 @@ public class Gala.PropertyTarget : Object, GestureTarget {
         target = null;
     }
 
-    public override void propagate (UpdateType update_type, GestureAction action, double progress) {
+    public void propagate (UpdateType update_type, GestureAction action, double progress) {
         if (target == null || update_type != UPDATE || action != this.action) {
             return;
         }

lib/Gestures/ScrollBackend.vala

@@ -73,7 +73,7 @@ private class Gala.ScrollBackend : Object, GestureBackend {
         // Scroll events apply the natural scroll preferences out of the box
         // Standardize them so the direction matches the physical direction of the gesture and the
         // GestureTracker user can decide if it wants to follow natural scroll settings or not
-        bool natural_scroll = settings.is_natural_scroll_enabled (Clutter.InputDeviceType.TOUCHPAD_DEVICE);
+        bool natural_scroll = GestureSettings.is_natural_scroll_enabled (Clutter.InputDeviceType.TOUCHPAD_DEVICE);
         if (natural_scroll) {
             x *= -1;
             y *= -1;

lib/Gestures/ToucheggBackend.vala

@@ -150,18 +150,6 @@ private class Gala.ToucheggBackend : Object, GestureBackend {
         new Thread<void> (null, (owned) run);
     }
 
-    public void stop () {
-        try {
-            reconnection_attempts = MAX_RECONNECTION_ATTEMPTS;
-
-            if (!connection.closed) {
-                connection.close_sync ();
-            }
-        } catch (Error e) {
-            // Ignore this error, the process is being killed as this point
-        }
-    }
-
     [CCode (instance_pos = -1)]
     private void on_new_message (DBusConnection connection, string? sender_name, string object_path,
         string interface_name, string signal_name, Variant parameters) {

src/ShellClients/ShellClientsManager.vala

@@ -205,7 +205,7 @@ public class Gala.ShellClientsManager : Object, GestureTarget {
         window.unmanaging.connect_after ((_window) => positioned_windows.remove (_window));
     }
 
-    public override void propagate (UpdateType update_type, GestureAction action, double progress) {
+    public void propagate (UpdateType update_type, GestureAction action, double progress) {
         foreach (var window in positioned_windows.get_values ()) {
             window.propagate (update_type, action, progress);
         }

src/ShellClients/ShellWindow.vala

@@ -41,7 +41,7 @@ public class Gala.ShellWindow : PositionedWindow, GestureTarget {
         );
     }
 
-    public override void propagate (UpdateType update_type, GestureAction action, double progress) {
+    public void propagate (UpdateType update_type, GestureAction action, double progress) {
         switch (update_type) {
             case START:
                 animations_ongoing++;

src/Widgets/WindowSwitcher/WindowSwitcher.vala

@@ -230,7 +230,7 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget {
         ctx.restore ();
     }
 
-    public override void propagate (UpdateType update_type, GestureAction action, double progress) {
+    public void propagate (UpdateType update_type, GestureAction action, double progress) {
         if (update_type != UPDATE || container.get_n_children () == 0) {
             return;
         }