Merge branch 'main' into lenemter/improve-dock-reveal-animation

Author: lenemter

.github/workflows/main.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Install Dependencies
       run: |
         apt update
-        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-3-dev libgranite-dev libgtk-3-dev ${{ matrix.mutter_pkg }} 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
@@ -69,7 +69,7 @@ jobs:
         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-3-devel granite6-devel granite-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite3-devel meson vala valadoc gcc
+          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:

README.md

@@ -11,9 +11,12 @@ You'll need the following dependencies:
 * 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)
 * meson (>= 0.59.0)
 * valac (>= 0.46.0)

docs/meson.build

@@ -10,7 +10,7 @@ basic_command = [
     '--package-name','gala',
     '--package-version', meson.project_version(),
     mutter_packages_command,
-    '--pkg', 'gtk+-3.0',
+    '--pkg', 'gtk4',
     '--pkg', 'gee-0.8',
     '--pkg', 'gio-unix-2.0',
     '--pkg', 'gmodule-2.0',
@@ -41,10 +41,9 @@ all_doc_target = custom_target(
         '--internal',
         '--pkg', 'sqlite3',
         '--pkg', 'atk-bridge-2.0',
-        '--pkg', 'gnome-desktop-3.0',
+        '--pkg', 'gnome-bg-4',
+        '--pkg', 'gnome-desktop-4',
         '--pkg', 'libsystemd',
-        '--pkg', 'gnome-desktop-3.0',
-        '--pkg', 'gmodule-2.0',
         '--pkg', 'wayland-server',
         '--pkg', 'pantheon-desktop-shell',
         '--vapidir=' + join_paths(meson.global_source_root(), 'protocol'),

lib/Drawing/Color.vala

@@ -11,10 +11,10 @@ namespace Gala.Drawing {
     public class Color : GLib.Object {
         public const Gdk.RGBA LIGHT_BACKGROUND = { (250f / 255f), (250f / 255f), (250f / 255f), 1};
         public const Gdk.RGBA DARK_BACKGROUND = { (51 / 255f), (51 / 255f), (51 / 255f), 1};
-        public const Gdk.RGBA LIGHT_BORDER = { 0, 0, 0, 0.2};
-        public const Gdk.RGBA DARK_BORDER = { 0, 0, 0, 0.75};
+        public const Gdk.RGBA LIGHT_BORDER = { 0, 0, 0, 0.2f};
+        public const Gdk.RGBA DARK_BORDER = { 0, 0, 0, 0.75f};
         public const Gdk.RGBA LIGHT_HIGHLIGHT = { 255, 255, 255, 1};
-        public const Gdk.RGBA DARK_HIGHLIGHT = { 255, 255, 255, 0.05};
+        public const Gdk.RGBA DARK_HIGHLIGHT = { 255, 255, 255, 0.05f};
         public const Gdk.RGBA TOOLTIP_BACKGROUND = { 0, 0, 0, 1};
         public const Gdk.RGBA TOOLTIP_TEXT_COLOR = { 1, 1, 1, 1};
 

lib/Drawing/StyleManager.vala

@@ -31,7 +31,7 @@ public class Gala.Drawing.StyleManager : Object {
     private const string FDO_ACCOUNTS_NAME = "org.freedesktop.Accounts";
     private const string FDO_ACCOUNTS_PATH = "/org/freedesktop/Accounts";
 
-    private const double ACCENT_COLOR_ALPHA = 0.25;
+    private const float ACCENT_COLOR_ALPHA = 0.25f;
     private const Gdk.RGBA DEFAULT_ACCENT_COLOR = { 0, 0, 0, ACCENT_COLOR_ALPHA };
 
     private static GLib.Once<StyleManager> instance;
@@ -94,9 +94,9 @@ public class Gala.Drawing.StyleManager : Object {
     private void update_color (int color) {
         var rgb = get_color (color);
 
-        double r = ((rgb >> 16) & 255) / 255.0;
-        double g = ((rgb >> 8) & 255) / 255.0;
-        double b = (rgb & 255) / 255.0;
+        var r = ((rgb >> 16) & 255) / 255.0f;
+        var g = ((rgb >> 8) & 255) / 255.0f;
+        var b = (rgb & 255) / 255.0f;
 
         theme_accent_color = {
             r,

lib/Gestures/ActorTarget.vala

@@ -11,12 +11,6 @@
  * If a new child (or target via {@link add_target}) is added, its progress will be synced.
  */
 public class Gala.ActorTarget : Clutter.Actor, GestureTarget {
-    public Clutter.Actor? actor {
-        get {
-            return this;
-        }
-    }
-
     public bool animating { get { return ongoing_animations > 0; } }
 
     private double[] current_progress;

lib/Gestures/GestureTarget.vala

@@ -13,11 +13,5 @@ public interface Gala.GestureTarget : Object {
         END
     }
 
-    /**
-     * The actor manipulated by the gesture. The associated frame clock
-     * will be used for animation timelines.
-     */
-    public abstract Clutter.Actor? actor { get; }
-
     public virtual void propagate (UpdateType update_type, GestureAction action, double progress) { }
 }

lib/Gestures/PropertyTarget.vala

@@ -7,27 +7,34 @@
 
 public class Gala.PropertyTarget : Object, GestureTarget {
     public GestureAction action { get; construct; }
-
-    //we don't want to hold a strong reference to the actor because we might've been added to it which would form a reference cycle
-    private weak Clutter.Actor? _actor;
-    public Clutter.Actor? actor { get { return _actor; } }
-
+    // Don't take a reference since we are most of the time owned by the target
+    public weak Object? target { get; private set; }
     public string property { get; construct; }
 
     public Clutter.Interval interval { get; construct; }
 
-    public PropertyTarget (GestureAction action, Clutter.Actor actor, string property, Type value_type, Value from_value, Value to_value) {
+    public PropertyTarget (GestureAction action, Object target, string property, Type value_type, Value from_value, Value to_value) {
         Object (action: action, property: property, interval: new Clutter.Interval.with_values (value_type, from_value, to_value));
 
-        _actor = actor;
-        _actor.destroy.connect (() => _actor = null);
+        this.target = target;
+        this.target.weak_ref (on_target_disposed);
+    }
+
+    ~PropertyTarget () {
+        if (target != null) {
+            target.weak_unref (on_target_disposed);
+        }
+    }
+
+    private void on_target_disposed () {
+        target = null;
     }
 
     public override void propagate (UpdateType update_type, GestureAction action, double progress) {
-        if (update_type != UPDATE || action != this.action) {
+        if (target == null || update_type != UPDATE || action != this.action) {
             return;
         }
 
-        actor.set_property (property, interval.compute (progress));
+        target.set_property (property, interval.compute (progress));
     }
 }

lib/Gestures/RootTarget.vala

@@ -6,6 +6,12 @@
  */
 
 public interface Gala.RootTarget : Object, GestureTarget {
+    /**
+     * The actor manipulated by the gesture. The associated frame clock
+     * will be used for animation timelines.
+     */
+    public abstract Clutter.Actor? actor { get; }
+
     public void add_gesture_controller (GestureController controller) requires (controller.target == null) {
         controller.attached (this);
         weak_ref (controller.detached);

lib/Utils.vala

@@ -34,8 +34,10 @@ namespace Gala {
         private static Gtk.IconTheme icon_theme;
 
         static construct {
-            icon_theme = new Gtk.IconTheme ();
-            icon_theme.set_custom_theme ("elementary");
+            icon_theme = new Gtk.IconTheme () {
+                theme_name = "elementary"
+            };
+
             icon_cache = new Gee.HashMultiMap<DesktopAppInfo, CachedIcon?> ();
             window_to_desktop_cache = new Gee.HashMap<Meta.Window, DesktopAppInfo> ();
             unknown_icon_cache = new Gee.ArrayList<CachedIcon?> ();
@@ -159,9 +161,19 @@ namespace Gala {
 
             // Construct a new "application-default-icon" and store it in the cache
             try {
-                var icon = icon_theme.load_icon_for_scale ("application-default-icon", icon_size, scale, 0);
-                unknown_icon_cache.add (CachedIcon () { icon = icon, icon_size = icon_size, scale = scale });
-                return icon;
+                var icon_paintable = icon_theme.lookup_icon (
+                    "application-default-icon",
+                    null,
+                    icon_size,
+                    scale,
+                    Gtk.TextDirection.NONE,
+                    0
+                );
+
+                var pixbuf = new Gdk.Pixbuf.from_file (icon_paintable.get_file ().get_path ());
+
+                unknown_icon_cache.add (CachedIcon () { icon = pixbuf, icon_size = icon_size, scale = scale });
+                return pixbuf;
             } catch (Error e) {
                 var icon = new Gdk.Pixbuf (Gdk.Colorspace.RGB, true, 8, icon_size * scale, icon_size * scale);
                 icon.fill (0x00000000);
@@ -228,14 +240,19 @@ namespace Gala {
 
             if (icon is GLib.ThemedIcon) {
                 var icon_names = ((GLib.ThemedIcon)icon).get_names ();
-                var icon_info = icon_theme.choose_icon_for_scale (icon_names, icon_size, scale, 0);
+                if (icon_names.length == 0) {
+                    return null;
+                }
+
+                var icon_paintable = icon_theme.lookup_icon (icon_names[0], icon_names[1:], icon_size, scale, NONE, 0);
 
-                if (icon_info == null) {
+                var path = icon_paintable.get_file ()?.get_path ();
+                if (path == null) {
                     return null;
                 }
 
                 try {
-                    var pixbuf = icon_info.load_icon ();
+                    var pixbuf = new Gdk.Pixbuf.from_file (path);
                     icon_cache.@set (desktop, CachedIcon () { icon = pixbuf, icon_size = icon_size, scale = scale });
                     return pixbuf;
                 } catch (Error e) {