Merge branch 'main' into leolost/make-modal

Author: leolost2605

.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,11 +27,11 @@ jobs:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y gettext gsettings-desktop-schemas-dev libatk-bridge2.0-dev libcanberra-dev libclutter-1.0-dev libgee-0.8-dev libglib2.0-dev libgnome-desktop-3-dev libgranite-dev libgtk-3-dev ${{ matrix.mutter_pkg }} libxml2-utils libsqlite3-dev meson valac valadoc
+        apt install -y gettext gsettings-desktop-schemas-dev libatk-bridge2.0-dev libclutter-1.0-dev libgee-0.8-dev libglib2.0-dev libgnome-desktop-4-dev libgnome-bg-4-dev libgranite-dev libgtk-3-dev ${{ matrix.mutter_pkg }} libsqlite3-dev meson valac valadoc
     - name: Build
       env:
         DESTDIR: out
@@ -47,29 +47,49 @@ 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 xml2 sqlite-devel meson valac valadoc
+          dnf install -y desktop-file-utils gettext gsettings-desktop-schemas-devel atk-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
       - name: Build
         env:
           DESTDIR: out
         run: |
           meson build
           ninja -C build install
 
-  lint:
+  open-suse-leap:
+    runs-on: ubuntu-latest
+
+    container:
+      image: opensuse/leap:latest
+
+    steps:
+      - name: Install dependencies
+        run: |
+          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 clutter-devel libgee-devel glib2-devel libgnome-desktop-4-devel granite6-devel granite-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite3-devel meson vala valadoc gcc
+      - uses: actions/checkout@v5
+      - name: Build
+        env:
+          DESTDIR: out
+        run: |
+          meson build
+          ninja -C build install
 
+  lint:
     runs-on: ubuntu-latest
 
     container:
       image: valalang/lint
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Lint
       run: |
         io.elementary.vala-lint -d daemon
+        io.elementary.vala-lint -d daemon-gtk3
         io.elementary.vala-lint -d lib
         io.elementary.vala-lint -d plugins
         io.elementary.vala-lint -d src

.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"

.gitignore

@@ -3,9 +3,6 @@ aclocal.m4
 autom4te.cache
 /build-aux/*
 ChangeLog
-config.h
-config.h.in
-config.h.in~
 config.log
 config.status
 configure
@@ -47,3 +44,4 @@ po/Rules-quot
 po/stamp-po
 src/gala
 build
+debian

README.md

@@ -8,15 +8,16 @@ A window & compositing manager based on libmutter and designed by elementary for
 You'll need the following dependencies:
 * gettext (>= 0.19.6)
 * gsettings-desktop-schemas-dev
-* libcanberra-dev
 * libclutter-1.0-dev (>= 1.12.0)
 * libgee-0.8-dev
 * libglib2.0-dev (>= 2.74)
-* libgnome-desktop-3-dev
+* libgnome-desktop-4-dev
+* libgnome-bg-4-dev
 * libgranite-dev (>= 5.4.0)
-* libgtk-3-dev (>= 3.10.0)
+* libgranite-7-dev
+* libgtk-3-dev
+* libgtk-4-dev
 * libmutter-10-dev (>= 42.0) | libmutter-dev (>= 3.18.3)
-* libxml2-utils
 * meson (>= 0.59.0)
 * valac (>= 0.46.0)
 

config.vala.in

@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io)
+ *                         2011 Robert Dyer
+ *                         2011 Rico Tzschichholz
+ */
+
+namespace Config {
+	public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
+	public const string LOCALEDIR = "@LOCALEDIR@";
+	public const string VERSION = "@VERSION@";
+	public const string PLUGINDIR = "@PLUGINDIR@";
+}

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-gtk3/DBus.vala

@@ -90,8 +90,8 @@ public class Gala.Daemon.DBus : GLib.Object {
         menu.attach_to_widget (window.content, null);
 
         Gdk.Rectangle rect = {
-            x,
-            y,
+            x / window.scale_factor,
+            y / window.scale_factor,
             0,
             0
         };

daemon-gtk3/Window.vala

@@ -6,13 +6,12 @@
  */
 
 public class Gala.Daemon.Window : Gtk.Window {
+    public int width { get; construct; }
+    public int height { get; construct; }
     public Gtk.Box content { get; construct; }
 
     public Window (int width, int height) {
-        Object (
-            default_width: width,
-            default_height: height
-        );
+        Object (width: width, height: height);
     }
 
     class construct {
@@ -34,7 +33,9 @@ public class Gala.Daemon.Window : Gtk.Window {
         title = "MODAL";
         child = content = new Gtk.Box (HORIZONTAL, 0) {
             hexpand = true,
-            vexpand = true
+            vexpand = true,
+            width_request = width,
+            height_request = height
         };
 
         set_visual (get_screen ().get_rgba_visual ());

daemon-gtk3/WindowMenu.vala

@@ -174,12 +174,12 @@ public class Gala.Daemon.WindowMenu : Gtk.Menu {
         SignalHandler.unblock (always_on_top, always_on_top_sid);
         SignalHandler.unblock (on_visible_workspace, on_visible_workspace_sid);
 
-        move_right.sensitive = !on_visible_workspace.active;
+        move_right.sensitive = !on_visible_workspace.active && Gala.WindowFlags.ALLOWS_MOVE_RIGHT in flags;
         if (move_right.sensitive) {
             move_right_accellabel.accel_string = keybind_settings.get_strv ("move-to-workspace-right")[0];
         }
 
-        move_left.sensitive = !on_visible_workspace.active;
+        move_left.sensitive = !on_visible_workspace.active && Gala.WindowFlags.ALLOWS_MOVE_LEFT in flags;
         if (move_left.sensitive) {
             move_left_accellabel.accel_string = keybind_settings.get_strv ("move-to-workspace-left")[0];
         }