Merge branch 'main' into lenemter/hide-pip-in-mtv

Author: lenemter

.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,7 +10,7 @@ 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: actions/checkout@v5
      - uses: elementary/actions/release@main
        env:
          GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"

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/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);
+    }
+}

lib/meson.build

@@ -17,6 +17,7 @@ gala_lib_sources = files(
     'Plugin.vala',
     'RoundedCornersEffect.vala',
     'ShadowEffect.vala',
+    'Text.vala',
     'Utils.vala',
     'WindowIcon.vala',
     'WindowManager.vala',

meson.build

@@ -141,6 +141,17 @@ if mutter48_dep.found()
 	vala_flags = ['--define', 'HAS_MUTTER43', '--define', 'HAS_MUTTER44', '--define', 'HAS_MUTTER45', '--define', 'HAS_MUTTER46', '--define', 'HAS_MUTTER47', '--define', 'HAS_MUTTER48']
 endif
 
+mutter49_dep = dependency('libmutter-17', version: ['>= 49', '< 50'], required: false)
+if mutter49_dep.found()
+	libmutter_dep = dependency('libmutter-17', version: '>= 49')
+	mutter_dep = [
+		libmutter_dep,
+		dependency('mutter-mtk-17'), dependency('mutter-cogl-17'),
+		dependency('mutter-clutter-17')
+	]
+	vala_flags = ['--define', 'HAS_MUTTER43', '--define', 'HAS_MUTTER44', '--define', 'HAS_MUTTER45', '--define', 'HAS_MUTTER46', '--define', 'HAS_MUTTER47', '--define', 'HAS_MUTTER48', '--define', 'HAS_MUTTER49']
+endif
+
 if mutter_dep.length() == 0
     error ('No supported mutter library found!')
 endif

plugins/pip/PopupWindow.vala

@@ -10,7 +10,6 @@ public class Gala.Plugins.PIP.PopupWindow : RootTarget, ActorTarget {
     private const uint FADE_OUT_TIMEOUT = 200;
     private const float MINIMUM_SCALE = 0.1f;
     private const float MAXIMUM_SCALE = 1.0f;
-    private const int SCREEN_MARGIN = 0;
     private const float OFF_SCREEN_PERCENT = 0.5f;
     private const int OFF_SCREEN_VISIBLE_PIXELS = 80;
 
@@ -95,11 +94,11 @@ public class Gala.Plugins.PIP.PopupWindow : RootTarget, ActorTarget {
 
         float x_position, y_position;
         if (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL) {
-            x_position = SCREEN_MARGIN + workarea_rect.x;
+            x_position = workarea_rect.x;
         } else {
-            x_position = workarea_rect.x + workarea_rect.width - SCREEN_MARGIN - width;
+            x_position = workarea_rect.x + workarea_rect.width - width;
         }
-        y_position = workarea_rect.y + workarea_rect.height - SCREEN_MARGIN - height;
+        y_position = workarea_rect.y + workarea_rect.height - height;
 
         set_position (x_position, y_position);
 
@@ -451,10 +450,10 @@ public class Gala.Plugins.PIP.PopupWindow : RootTarget, ActorTarget {
 
         var workarea_rect = wm.get_display ().get_workspace_manager ().get_active_workspace ().get_work_area_all_monitors ();
 
-        var screen_limit_start_x = workarea_rect.x + SCREEN_MARGIN;
-        var screen_limit_end_x = workarea_rect.x + workarea_rect.width - SCREEN_MARGIN - width;
-        var screen_limit_start_y = workarea_rect.y + SCREEN_MARGIN;
-        var screen_limit_end_y = workarea_rect.y + workarea_rect.height - SCREEN_MARGIN - height;
+        var screen_limit_start_x = workarea_rect.x;
+        var screen_limit_end_x = workarea_rect.x + workarea_rect.width - width;
+        var screen_limit_start_y = workarea_rect.y;
+        var screen_limit_end_y = workarea_rect.y + workarea_rect.height - height;
 
         var duration = Utils.get_animation_duration (300);