Merge branch 'main' into leolost/panel-window-use-window-positioner

Author: leolost2605

.github/workflows/main.yml

@@ -40,6 +40,24 @@ jobs:
         ninja -C build
         ninja -C build install
 
+  fedora:
+    runs-on: ubuntu-latest
+
+    container:
+      image: fedora:latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - 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
+      - name: Build
+        env:
+          DESTDIR: out
+        run: |
+          meson build
+          ninja -C build install
+
   lint:
 
     runs-on: ubuntu-latest

lib/App.vala

@@ -158,8 +158,8 @@ public class Gala.App : GLib.Object {
         return windows.data;
     }
 
-    public GLib.SList<Posix.pid_t?> get_pids () {
-        var results = new GLib.SList<Posix.pid_t?> ();
+    public GLib.SList<pid_t?> get_pids () {
+        var results = new GLib.SList<pid_t?> ();
         foreach (unowned var window in windows) {
             var pid = window.get_pid ();
             if (pid < 1) {

meson.build

@@ -158,6 +158,17 @@ if mutter46_dep.found()
 	vala_flags = ['--define', 'HAS_MUTTER43', '--define', 'HAS_MUTTER44', '--define', 'HAS_MUTTER45', '--define', 'HAS_MUTTER46']
 endif
 
+mutter47_dep = dependency('libmutter-15', version: ['>= 47', '< 48'], required: false)
+if mutter47_dep.found()
+	libmutter_dep = dependency('libmutter-15', version: '>= 47')
+	mutter_dep = [
+		libmutter_dep,
+		dependency('mutter-mtk-15'), dependency('mutter-cogl-15'),
+		dependency('mutter-cogl-pango-15'), dependency('mutter-clutter-15')
+	]
+	vala_flags = ['--define', 'HAS_MUTTER43', '--define', 'HAS_MUTTER44', '--define', 'HAS_MUTTER45', '--define', 'HAS_MUTTER46', '--define', 'HAS_MUTTER47']
+endif
+
 if mutter_dep.length() == 0
     error ('No supported mutter library found!')
 endif

po/fr.po

@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: gala\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2024-10-15 19:33+0000\n"
-"PO-Revision-Date: 2024-08-27 08:16+0000\n"
-"Last-Translator: Nathan <[email protected]>\n"
-"Language-Team: French <https://l10n.elementary.io/projects/desktop/gala/fr/"
-">\n"
+"PO-Revision-Date: 2024-11-13 15:14+0000\n"
+"Last-Translator: Stella Ménier <[email protected]>\n"
+"Language-Team: French <https://l10n.elementary.io/projects/desktop/gala/fr/>"
+"\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -122,18 +122,15 @@ msgid "Updated translations"
 msgstr "Mise à jour des traductions"
 
 #: data/gala.metainfo.xml.in:49
-#, fuzzy
-#| msgid "Fix a potential crash when taking screenshots"
 msgid "Fix a potential crash when moving windows between workspaces"
 msgstr ""
-"Correction d'un plantage potentiel lors de la prise de captures d'écran"
+"Correction d'un plantage potentiel lors du déplacement de fenêtres entre "
+"espaces de travail"
 
 #: data/gala.metainfo.xml.in:50
-#, fuzzy
-#| msgid "Fix notification position after changing DPI"
 msgid "Fix notification animation when entering multitasking view"
 msgstr ""
-"Correction de la position des notifications après la modification du DPI"
+"Correction de l'animation des notifications en entrant dans la vue multitâche"
 
 #: data/gala.metainfo.xml.in:65
 msgid "Improve keyboard navigation in Multitasking View"

src/Background/Background.vala

@@ -108,15 +108,38 @@ namespace Gala {
             var settings = background_source.gnome_background_settings;
 
             color_string = settings.get_string ("primary-color");
+#if HAS_MUTTER47
+            var color = Cogl.Color.from_string (color_string);
+#else
             var color = Clutter.Color.from_string (color_string);
+#endif
+            if (color == null) {
+#if HAS_MUTTER47
+                color = Cogl.Color.from_string ("black");
+#else
+                color = Clutter.Color.from_string ("black");
+#endif
+            }
 
             var shading_type = settings.get_enum ("color-shading-type");
 
             if (shading_type == GDesktop.BackgroundShading.SOLID) {
                 background.set_color (color);
             } else {
                 color_string = settings.get_string ("secondary-color");
+#if HAS_MUTTER47
+                var second_color = Cogl.Color.from_string (color_string);
+#else
                 var second_color = Clutter.Color.from_string (color_string);
+#endif
+                if (second_color == null) {
+#if HAS_MUTTER47
+                    second_color = Cogl.Color.from_string ("black");
+#else
+                    second_color = Clutter.Color.from_string ("black");
+#endif
+                }
+
                 background.set_gradient ((GDesktop.BackgroundShading) shading_type, color, second_color);
             }
         }

src/Background/BackgroundContainer.vala

@@ -49,7 +49,11 @@ namespace Gala {
         }
 
         public void set_black_background (bool black) {
+#if HAS_MUTTER47
+            set_background_color (black ? Cogl.Color.from_string ("Black") : null);
+#else
             set_background_color (black ? Clutter.Color.from_string ("Black") : null);
+#endif
         }
 
         private void update () {

src/InternalUtils.vala

@@ -71,8 +71,12 @@ namespace Gala {
             }
 
             unowned Meta.X11Display x11display = display.get_x11_display ();
+#if HAS_MUTTER47
+            x11display.set_stage_input_region (rects);
+#else
             var xregion = X.Fixes.create_region (x11display.get_xdisplay (), rects);
             x11display.set_stage_input_region (xregion);
+#endif
         }
 
         /**

src/ScreenshotManager.vala

@@ -65,7 +65,9 @@ namespace Gala {
             var flash_actor = new Clutter.Actor ();
             flash_actor.set_size (width, height);
             flash_actor.set_position (x, y);
-#if HAS_MUTTER46
+#if HAS_MUTTER47
+            flash_actor.set_background_color (Cogl.Color.from_string ("white"));
+#elif HAS_MUTTER46
             flash_actor.set_background_color (Clutter.Color.from_pixel (0xffffffffu));
 #else
             flash_actor.set_background_color (Clutter.Color.get_static (Clutter.StaticColor.WHITE));
@@ -151,8 +153,12 @@ namespace Gala {
             window_actor.get_position (out actor_x, out actor_y);
 
             var rect = window.get_frame_rect ();
+#if HAS_MUTTER45
+            if (!include_frame) {
+#if else
             if ((include_frame && window.is_client_decorated ()) ||
                 (!include_frame && !window.is_client_decorated ())) {
+#endif
                 rect = window.frame_rect_to_client_rect (rect);
             }
 

src/ShellClients/HideTracker.vala

@@ -6,14 +6,27 @@
  */
 
 public class Gala.HideTracker : Object {
-    private const uint UPDATE_TIMEOUT = 200;
+    private const int BARRIER_OFFSET = 50; // Allow hot corner trigger
+    private const int UPDATE_TIMEOUT = 200;
+    private const int HIDE_DELAY = 500;
 
     public signal void hide ();
     public signal void show ();
 
     public Meta.Display display { get; construct; }
     public unowned PanelWindow panel { get; construct; }
-    public Pantheon.Desktop.HideMode hide_mode { get; set; default = NEVER; }
+
+    private Pantheon.Desktop.HideMode _hide_mode = NEVER;
+    public Pantheon.Desktop.HideMode hide_mode {
+        get {
+            return _hide_mode;
+        }
+        set {
+            _hide_mode = value;
+
+            setup_barrier ();
+        }
+    }
 
     private Clutter.PanAction pan_action;
 
@@ -25,12 +38,21 @@ public class Gala.HideTracker : Object {
 
     private Meta.Window current_focus_window;
 
+    private Barrier? barrier;
+
+    private uint hide_timeout_id = 0;
     private uint update_timeout_id = 0;
 
     public HideTracker (Meta.Display display, PanelWindow panel) {
         Object (display: display, panel: panel);
     }
 
+    ~HideTracker () {
+        if (hide_timeout_id != 0) {
+            Source.remove (hide_timeout_id);
+        }
+    }
+
     construct {
         // Can't be local otherwise we get a memory leak :(
         // See https://gitlab.gnome.org/GNOME/vala/-/issues/1548
@@ -163,10 +185,6 @@ public class Gala.HideTracker : Object {
 
     private void update_hidden () {
         switch (hide_mode) {
-            case NEVER:
-                toggle_display (false);
-                break;
-
             case MAXIMIZED_FOCUS_WINDOW:
                 toggle_display (focus_maximized_overlap);
                 break;
@@ -182,6 +200,10 @@ public class Gala.HideTracker : Object {
             case ALWAYS:
                 toggle_display (true);
                 break;
+
+            default:
+                warning ("HideTracker: unsupported hide mode.");
+                break;
         }
     }
 
@@ -196,23 +218,44 @@ public class Gala.HideTracker : Object {
 #endif
 
         if (should_hide && !hovered && !panel.window.has_focus ()) {
-            // Don't hide if we have transients, e.g. an open popover, dialog, etc.
-            var has_transients = false;
-            panel.window.foreach_transient (() => {
-                has_transients = true;
-                return false;
-            });
-
-            if (has_transients) {
-                return;
-            }
+            trigger_hide ();
+        } else {
+            trigger_show ();
+        }
+    }
+
+    private void trigger_hide () {
+        // Don't hide if we have transients, e.g. an open popover, dialog, etc.
+        var has_transients = false;
+        panel.window.foreach_transient (() => {
+            has_transients = true;
+            return false;
+        });
+
+        if (has_transients) {
+            reset_hide_timeout ();
+
+            return;
+        }
 
+        hide_timeout_id = Timeout.add_once (HIDE_DELAY, () => {
             hide ();
-        } else {
-            show ();
+            hide_timeout_id = 0;
+        });
+    }
+
+    private void reset_hide_timeout () {
+        if (hide_timeout_id != 0) {
+            Source.remove (hide_timeout_id);
+            hide_timeout_id = 0;
         }
     }
 
+    private void trigger_show () {
+        reset_hide_timeout ();
+        show ();
+    }
+
     private bool check_valid_gesture () {
         if (panel.anchor != BOTTOM) {
             debug ("Swipe to reveal is currently only supported for bottom anchors");
@@ -236,9 +279,71 @@ public class Gala.HideTracker : Object {
 
         if (delta_y < 0) { // Only allow swipes upwards
             panel.window.focus (pan_action.get_last_event (0).get_time ());
-            show ();
+            trigger_show ();
         }
 
         return false;
     }
+
+    private void setup_barrier () {
+        var monitor_geom = display.get_monitor_geometry (display.get_primary_monitor ());
+        var scale = display.get_monitor_scale (display.get_primary_monitor ());
+        var offset = InternalUtils.scale_to_int (BARRIER_OFFSET, scale);
+
+        switch (panel.anchor) {
+            case TOP:
+                setup_barrier_top (monitor_geom, offset);
+                break;
+
+            case BOTTOM:
+                setup_barrier_bottom (monitor_geom, offset);
+                break;
+
+            default:
+                warning ("Barrier side not supported yet");
+                break;
+        }
+    }
+
+#if HAS_MUTTER45
+    private void setup_barrier_top (Mtk.Rectangle monitor_geom, int offset) {
+#else
+    private void setup_barrier_top (Meta.Rectangle monitor_geom, int offset) {
+#endif
+        barrier = new Barrier (
+            display.get_context ().get_backend (),
+            monitor_geom.x + offset,
+            monitor_geom.y,
+            monitor_geom.x + monitor_geom.width - offset,
+            monitor_geom.y,
+            POSITIVE_Y,
+            0,
+            0,
+            int.MAX,
+            int.MAX
+        );
+
+        barrier.trigger.connect (trigger_show);
+    }
+
+#if HAS_MUTTER45
+    private void setup_barrier_bottom (Mtk.Rectangle monitor_geom, int offset) {
+#else
+    private void setup_barrier_bottom (Meta.Rectangle monitor_geom, int offset) {
+#endif
+        barrier = new Barrier (
+            display.get_context ().get_backend (),
+            monitor_geom.x + offset,
+            monitor_geom.y + monitor_geom.height,
+            monitor_geom.x + monitor_geom.width - offset,
+            monitor_geom.y + monitor_geom.height,
+            NEGATIVE_Y,
+            0,
+            0,
+            int.MAX,
+            int.MAX
+        );
+
+        barrier.trigger.connect (trigger_show);
+    }
 }

src/ShellClients/PanelClone.vala

@@ -141,7 +141,7 @@ public class Gala.PanelClone : Object {
         clone.restore_easing_state ();
     }
 
-    public void show () {
+    private void show () {
         if (!panel_hidden) {
             return;
         }