Merge branch 'main' into lenemter/add-hide-delay

Author: stsdc

.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/AnimationsSettings.vala

@@ -22,4 +22,11 @@ namespace AnimationsSettings {
 
         return enable_animations;
     }
+
+    /**
+     * Utility that returns the given duration or 0 if animations are disabled.
+     */
+    public uint get_animation_duration (uint duration) {
+        return get_enable_animations () ? duration : 0;
+    }
 }

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

plugins/pip/PopupWindow.vala

@@ -142,15 +142,15 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         opacity = 0;
 
         save_easing_state ();
-        set_easing_duration (AnimationsSettings.get_enable_animations () ? 200 : 0);
+        set_easing_duration (AnimationsSettings.get_animation_duration (200));
         opacity = 255;
         restore_easing_state ();
     }
 
     public override void hide () {
         opacity = 255;
 
-        var duration = AnimationsSettings.get_enable_animations () ? 200 : 0;
+        var duration = AnimationsSettings.get_animation_duration (200);
         save_easing_state ();
         set_easing_duration (duration);
         opacity = 0;
@@ -172,7 +172,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 #else
     public override bool enter_event (Clutter.CrossingEvent event) {
 #endif
-        var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
+        var duration = AnimationsSettings.get_animation_duration (300);
 
         close_button.save_easing_state ();
         close_button.set_easing_duration (duration);
@@ -192,7 +192,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 #else
     public override bool leave_event (Clutter.CrossingEvent event) {
 #endif
-        var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
+        var duration = AnimationsSettings.get_animation_duration (300);
 
         close_button.save_easing_state ();
         close_button.set_easing_duration (duration);
@@ -314,7 +314,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     }
 
     private void on_close_click_clicked () {
-        var duration = AnimationsSettings.get_enable_animations () ? FADE_OUT_TIMEOUT : 0;
+        var duration = AnimationsSettings.get_animation_duration (FADE_OUT_TIMEOUT);
 
         save_easing_state ();
         set_easing_duration (duration);
@@ -448,7 +448,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         var screen_limit_start_y = SCREEN_MARGIN + monitor_y;
         var screen_limit_end_y = monitor_height + monitor_y - SCREEN_MARGIN - height;
 
-        var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
+        var duration = AnimationsSettings.get_animation_duration (300);
 
         save_easing_state ();
         set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK);
@@ -461,7 +461,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     private bool place_window_off_screen () {
         off_screen = false;
 
-        var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
+        var duration = AnimationsSettings.get_animation_duration (300);
 
         save_easing_state ();
         set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK);

po/zh_TW.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \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-09-19 10:09+0000\n"
+"PO-Revision-Date: 2024-11-06 11:20+0000\n"
 "Last-Translator: Kisaragi Hiu <[email protected]>\n"
 "Language-Team: Chinese (Traditional) <https://l10n.elementary.io/projects/"
 "desktop/gala/zh_Hant/>\n"
@@ -151,11 +151,11 @@ msgstr "修正多工作業檢視中手勢可能會停止運作的問題"
 
 #: data/gala.metainfo.xml.in:109
 msgid "Improve dynamic workspaces behaviour with multiple monitors"
-msgstr "改善多螢幕時的動態工作空間行為"
+msgstr "改善多螢幕時的動態工作區行為"
 
 #: data/gala.metainfo.xml.in:131
 msgid "Improve handling of move-to-workspace shortcut"
-msgstr "改善移動到工作空間快捷鍵的處理"
+msgstr "改善「移動到工作區」快捷鍵的處理"
 
 #: data/gala-multitaskingview.desktop.in:4
 #: data/gala-multitaskingview.desktop.in:6

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