Merge branch 'main' into lenemter/move-close-reason

Author: lenemter

src/AbstractBubble.vala

@@ -41,6 +41,7 @@ public class Notifications.AbstractBubble : Gtk.Window {
 
     private Gtk.Revealer close_revealer;
     private Gtk.Box draw_area;
+    private Gtk.Overlay overlay;
 
     private uint timeout_id;
 
@@ -82,7 +83,7 @@ public class Notifications.AbstractBubble : Gtk.Window {
             overflow = VISIBLE
         };
 
-        var overlay = new Gtk.Overlay () {
+        overlay = new Gtk.Overlay () {
             child = draw_area
         };
         overlay.add_overlay (close_revealer);
@@ -102,11 +103,7 @@ public class Notifications.AbstractBubble : Gtk.Window {
         can_focus = false;
         set_titlebar (new Gtk.Grid ());
 
-        carousel.page_changed.connect ((index) => {
-            if (index == 0) {
-                closed (CloseReason.DISMISSED);
-            }
-        });
+        carousel.page_changed.connect (on_page_changed);
         close_button.clicked.connect (() => closed (CloseReason.DISMISSED));
 
         var motion_controller = new Gtk.EventControllerMotion ();
@@ -124,18 +121,7 @@ public class Notifications.AbstractBubble : Gtk.Window {
             }
         });
 
-        carousel.notify["position"].connect (() => {
-            current_swipe_progress = carousel.position;
-
-            if (desktop_panel != null) {
-                int left, right;
-                get_blur_margins (out left, out right);
-
-                desktop_panel.add_blur (left, right, 16, 16, 9);
-            } else if (Gdk.Display.get_default () is Gdk.X11.Display) {
-                x11_update_mutter_hints ();
-            }
-        });
+        carousel.notify["position"].connect (update_swipe_progress);
 
         transparency_settings.changed["use-transparency"].connect (update_transparency);
         update_transparency ();
@@ -149,6 +135,27 @@ public class Notifications.AbstractBubble : Gtk.Window {
         }
     }
 
+    private void on_page_changed (Adw.Carousel carousel, uint index) {
+        if (carousel.get_nth_page (index) != overlay) {
+            closed (CloseReason.DISMISSED);
+        }
+    }
+
+    private void update_swipe_progress (Object obj, ParamSpec pspec) {
+        var carousel = (Adw.Carousel) obj;
+
+        current_swipe_progress = carousel.position;
+
+        if (desktop_panel != null) {
+            int left, right;
+            get_blur_margins (out left, out right);
+
+            desktop_panel.add_blur (left, right, 16, 16, 9);
+        } else if (Gdk.Display.get_default () is Gdk.X11.Display) {
+            x11_update_mutter_hints ();
+        }
+    }
+
     public new void present () {
         if (timeout_id != 0) {
             Source.remove (timeout_id);

src/Application.vala

@@ -1,5 +1,5 @@
 /*
-* Copyright 2019-2023 elementary, Inc. (https://elementary.io)
+* Copyright 2019-2025 elementary, Inc. (https://elementary.io)
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public
@@ -19,9 +19,6 @@
 */
 
 public class Notifications.Application : Gtk.Application {
-    private static Granite.Settings granite_settings;
-    private static Gtk.Settings gtk_settings;
-
     public Application () {
         Object (
             application_id: "io.elementary.notifications",
@@ -45,13 +42,6 @@ public class Notifications.Application : Gtk.Application {
 
         Granite.init ();
 
-        granite_settings = Granite.Settings.get_default ();
-        gtk_settings = Gtk.Settings.get_default ();
-        gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK;
-        granite_settings.notify["prefers-color-scheme"].connect (() => {
-            gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK;
-        });
-
         unowned var context = CanberraGtk4.context_get ();
         context.change_props (
             Canberra.PROP_APPLICATION_NAME, "Notifications",