Merge branch 'main' into lenemter/drop-support-for-static-workspaces

Author: leolost2605

po/ja.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: noise\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2025-02-10 20:55+0000\n"
-"PO-Revision-Date: 2024-12-22 20:56+0000\n"
+"PO-Revision-Date: 2025-03-01 16:01+0000\n"
 "Last-Translator: Ryo Nakano <[email protected]>\n"
 "Language-Team: Japanese <https://l10n.elementary.io/projects/desktop/gala/ja/"
 ">\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.8.4\n"
+"X-Generator: Weblate 5.9.2\n"
 "X-Launchpad-Export-Date: 2017-03-02 05:47+0000\n"
 
 #: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -193,7 +193,7 @@ msgstr "すべての開いているウィンドウとワークスペースを参
 
 #: data/gala-other.desktop.in:4
 msgid "Other"
-msgstr "そのほか"
+msgstr "その他"
 
 #: data/gala-other.desktop.in:5
 msgid "Fallback desktop file for notifications from outdated applications."
@@ -291,11 +291,11 @@ msgstr "スクリーンショット %s"
 
 #: src/WindowManager.vala:2375
 msgid "Screenshot is saved to clipboard"
-msgstr ""
+msgstr "スクリーンショットをクリップボードに保存しました"
 
 #: src/WindowManager.vala:2375
 msgid "Screenshot saved to screenshots folder"
-msgstr ""
+msgstr "スクリーンショットを“スクリーンショット”フォルダーに保存しました"
 
 #~ msgid ""
 #~ "Set the keyboard layout correctly at startup so that the indicator "

src/DesktopIntegration.vala

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 elementary, Inc. <https://elementary.io>
+ * Copyright 2022-2025 elementary, Inc. <https://elementary.io>
  * Copyright 2022 Corentin Noël <[email protected]>
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
@@ -20,11 +20,30 @@ public class Gala.DesktopIntegration : GLib.Object {
     public uint version { get; default = 1; }
     public signal void running_applications_changed ();
     public signal void windows_changed ();
+    public signal void active_workspace_changed ();
+    public signal void workspace_removed (int index);
 
     public DesktopIntegration (WindowManagerGala wm) {
         this.wm = wm;
         wm.window_tracker.windows_changed.connect (() => windows_changed ());
-        wm.get_display ().get_workspace_manager ().active_workspace_changed.connect (() => windows_changed ());
+
+        unowned var display = wm.get_display ();
+        unowned var workspace_manager = display.get_workspace_manager ();
+        workspace_manager.active_workspace_changed.connect (() => {
+            active_workspace_changed ();
+            windows_changed (); // windows have 'on-active-workspace' property that we need to update
+        });
+        workspace_manager.workspaces_reordered.connect (() => windows_changed ());
+        workspace_manager.workspace_added.connect (() => windows_changed ());
+        workspace_manager.workspace_removed.connect ((index) => {
+            workspace_removed (index);
+            windows_changed ();
+        });
+
+        // TODO: figure out if there's a better way to handle ws rearrangement
+        display.window_created.connect ((window) => {
+            window.workspace_changed.connect (() => windows_changed ());
+        });
     }
 
     public RunningApplication[] get_running_applications () throws GLib.DBusError, GLib.IOError {
@@ -63,7 +82,7 @@ public class Gala.DesktopIntegration : GLib.Object {
     public Window[] get_windows () throws GLib.DBusError, GLib.IOError {
         Window[] returned_windows = {};
         var apps = Gala.AppSystem.get_default ().get_running_apps ();
-        var active_workspace = wm.get_display ().get_workspace_manager ().get_active_workspace ();
+        unowned var active_workspace = wm.get_display ().get_workspace_manager ().get_active_workspace ();
         foreach (unowned var app in apps) {
             foreach (weak Meta.Window window in app.get_windows ()) {
                 if (!is_eligible_window (window)) {
@@ -81,6 +100,7 @@ public class Gala.DesktopIntegration : GLib.Object {
                 properties.insert ("is-hidden", new GLib.Variant.boolean (window.is_hidden ()));
                 properties.insert ("has-focus", new GLib.Variant.boolean (window.has_focus ()));
                 properties.insert ("on-active-workspace", new GLib.Variant.boolean (window.located_on_workspace (active_workspace)));
+                properties.insert ("workspace-index", new GLib.Variant.int32 (window.get_workspace ().index ()));
                 properties.insert ("width", new GLib.Variant.uint32 (frame_rect.width));
                 properties.insert ("height", new GLib.Variant.uint32 (frame_rect.height));
 
@@ -122,6 +142,29 @@ public class Gala.DesktopIntegration : GLib.Object {
         }
     }
 
+    public void activate_workspace (int index) throws GLib.DBusError, GLib.IOError {
+        unowned var workspace = wm.get_display ().get_workspace_manager ().get_workspace_by_index (index);
+        if (workspace == null) {
+            throw new IOError.NOT_FOUND ("Workspace not found");
+        }
+
+        unowned var display = wm.get_display ();
+        unowned var active_workspace_index = display.get_workspace_manager ().get_active_workspace_index ();
+        if (active_workspace_index == index) {
+            InternalUtils.bell_notify (display);
+        } else {
+            workspace.activate (display.get_current_time ());
+        }
+    }
+
+    public int get_n_workspaces () throws GLib.DBusError, GLib.IOError {
+        return wm.get_display ().get_workspace_manager ().n_workspaces;
+    }
+
+    public int get_active_workspace () throws GLib.DBusError, GLib.IOError {
+        return wm.get_display ().get_workspace_manager ().get_active_workspace_index ();
+    }
+
     private bool notifying = false;
     private void notify_already_focused (Meta.Window window) {
         if (notifying) {

src/Gestures/ToucheggBackend.vala

@@ -200,19 +200,19 @@ public class Gala.ToucheggBackend : Object, GestureBackend {
                     on_gesture_detected (make_gesture (type, direction, fingers, performed_on_device_type), Meta.CURRENT_TIME);
                     on_begin (delta, elapsed_time);
                     return false;
-                });
+                }, Priority.DEFAULT);
                 break;
             case DBUS_ON_GESTURE_UPDATE:
                 Idle.add (() => {
                     on_update (delta, elapsed_time);
                     return false;
-                });
+                }, Priority.DEFAULT);
                 break;
             case DBUS_ON_GESTURE_END:
                 Idle.add (() => {
                     on_end (delta, elapsed_time);
                     return false;
-                });
+                }, Priority.DEFAULT);
                 break;
             default:
                 break;