Merge branch 'main' into lenemter/drop-windows-directly

Author: danirabbit

.github/workflows/gettext.yml

@@ -17,7 +17,7 @@ jobs:
         apt-get install git -y
 
     - name: Clone repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         token: ${{ secrets.GIT_USER_TOKEN }}
 

.github/workflows/main.yml

@@ -27,7 +27,7 @@ jobs:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install Dependencies
       run: |
         apt update
@@ -47,7 +47,7 @@ jobs:
       image: fedora:latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Dependencies
         run: |
           dnf install -y desktop-file-utils gettext gsettings-desktop-schemas-devel atk-devel libcanberra-devel clutter-devel libgee-devel glib2-devel gnome-desktop3-devel granite-devel granite-7-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite-devel meson valac valadoc
@@ -70,7 +70,7 @@ jobs:
           zypper addrepo https://download.opensuse.org/repositories/X11:Pantheon/15.6/X11:Pantheon.repo
           zypper --gpg-auto-import-keys refresh
           zypper --non-interactive install tar git desktop-file-utils gsettings-desktop-schemas-devel libatk-1_0-0 libcanberra-devel clutter-devel libgee-devel glib2-devel libgnome-desktop-3-devel granite6-devel granite-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite3-devel meson vala valadoc gcc
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Build
         env:
           DESTDIR: out
@@ -85,7 +85,7 @@ jobs:
       image: valalang/lint
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Lint
       run: |
         io.elementary.vala-lint -d daemon

.github/workflows/release.yml

@@ -10,8 +10,8 @@ jobs:
      runs-on: ubuntu-22.04
      if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
      steps:
-     - uses: actions/checkout@v4
-     - uses: elementary/actions/release@master
+     - uses: actions/checkout@v5
+     - uses: elementary/actions/release@main
        env:
          GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
          GIT_USER_NAME: "elementaryBot"

daemon-gtk3/BackgroundMenu.vala

@@ -4,8 +4,8 @@
  */
 
 public class Gala.Daemon.BackgroundMenu : Gtk.Menu {
-    public const string ACTION_GROUP_PREFIX = "background-menu";
-    public const string ACTION_PREFIX = ACTION_GROUP_PREFIX + ".";
+    private const string ACTION_GROUP_PREFIX = "background-menu";
+    private const string ACTION_PREFIX = ACTION_GROUP_PREFIX + ".";
 
     construct {
         var change_wallpaper = new Gtk.MenuItem.with_label (_("Change Wallpaper…")) {

daemon/MonitorLabel.vala

@@ -4,7 +4,6 @@
  */
 
  public class Gala.Daemon.MonitorLabel : Gtk.Window {
-    private const int SPACING = 12;
     private const string COLORED_STYLE_CSS = """
     .%s {
         background-color: alpha(%s, 0.8);

data/[email protected]

@@ -22,7 +22,7 @@ Type=notify
 ExecStart=@bindir@/gala
 
 # unset some environment variables that were set by the compositor and won't work now that the compositor is gone
-ExecStopPost=-/bin/sh -c 'test "$SERVICE_RESULT" != "exec-condition" && systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY'
+ExecStopPost=-/bin/sh -c 'test "$SERVICE_RESULT" != "exec-condition" && systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY && rm -f "$XDG_RUNTIME_DIR/wayland-0" "$XDG_RUNTIME_DIR/wayland-0.lock"'
 
 # On wayland we cannot restart
 Restart=no

lib/Gestures/Gesture.vala

@@ -39,9 +39,8 @@ namespace Gala {
         SWITCH_WORKSPACE,
         SWITCH_WINDOWS,
         MULTITASKING_VIEW,
-        DOCK,
         ZOOM,
-        CLOSE_WINDOW,
+        CUSTOM,
         N_ACTIONS
     }
 

lib/Gestures/GestureController.vala

@@ -60,6 +60,7 @@ public class Gala.GestureController : Object {
     public double distance { get; construct set; }
     public double overshoot_lower_clamp { get; construct set; default = 0d; }
     public double overshoot_upper_clamp { get; construct set; default = 1d; }
+    public bool follow_natural_scroll { get; set; default = false; }
 
     /**
      * When disabled gesture progress will stay where the gesture ended and not snap to full integers values.
@@ -166,6 +167,12 @@ public class Gala.GestureController : Object {
                 direction_multiplier = -1;
             }
 
+            if (follow_natural_scroll &&
+                !GestureSettings.is_natural_scroll_enabled (gesture.performed_on_device_type)
+            ) {
+                direction_multiplier *= -1;
+            }
+
             if (snap && !Meta.Prefs.get_gnome_animations ()) {
                 recognizing = false;
                 prepare ();

lib/Gestures/GestureSettings.vala

@@ -28,7 +28,7 @@ private class Gala.GestureSettings : Object {
         touchpad_settings = new GLib.Settings ("org.gnome.desktop.peripherals.touchpad");
     }
 
-    public bool is_natural_scroll_enabled (Clutter.InputDeviceType device_type) {
+    public static bool is_natural_scroll_enabled (Clutter.InputDeviceType device_type) {
         return (device_type == Clutter.InputDeviceType.TOUCHSCREEN_DEVICE)
             ? true
             : touchpad_settings.get_boolean ("natural-scroll");

lib/Text.vala

@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io)
+ */
+
+/*
+ * Clutter.Text that automatically changes font-name to the system one
+ */
+public class Gala.Text : Clutter.Text {
+    private static GLib.Settings gnome_interface_settings;
+
+    static construct {
+        gnome_interface_settings = new GLib.Settings ("org.gnome.desktop.interface");
+    }
+
+    construct {
+        set_system_font_name ();
+        gnome_interface_settings.changed["font-name"].connect (set_system_font_name);
+    }
+
+    private void set_system_font_name () {
+        var name = gnome_interface_settings.get_string ("font-name").split (" ");
+        var last_element_index = name.length - 1;
+
+        if (int.try_parse (name[last_element_index])) { // if last element is a font-size
+            name[last_element_index] = "12"; // hardcode size (can be changed later if needed)
+        } else {
+            name += "12";
+        }
+
+        font_name = string.joinv (" ", name);
+    }
+}