Merge branch 'main' into lenemter/fix-clip

Author: lenemter

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

daemon/DBus.vala

@@ -36,7 +36,9 @@ public enum Gala.WindowFlags {
     ALWAYS_ON_TOP,
     ON_ALL_WORKSPACES,
     CAN_CLOSE,
-    IS_TILED
+    IS_TILED,
+    ALLOWS_MOVE_LEFT,
+    ALLOWS_MOVE_RIGHT
 }
 
 [DBus (name = "org.pantheon.gala")]

daemon/WindowMenu.vala

@@ -200,12 +200,12 @@ public class Gala.Daemon.WindowMenu : Gtk.Popover {
         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];
         }

lib/WindowManager.vala

@@ -56,7 +56,9 @@ namespace Gala {
         ALWAYS_ON_TOP,
         ON_ALL_WORKSPACES,
         CAN_CLOSE,
-        IS_TILED
+        IS_TILED,
+        ALLOWS_MOVE_LEFT,
+        ALLOWS_MOVE_RIGHT
     }
 
     /**

po/ru.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: beat-box\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2025-06-03 19:09+0000\n"
-"PO-Revision-Date: 2025-04-21 05:55+0000\n"
-"Last-Translator: кубик круглый <megarainbow29@gmail.com>\n"
+"PO-Revision-Date: 2025-06-06 11:55+0000\n"
+"Last-Translator: lenemter <lenemter@gmail.com>\n"
 "Language-Team: Russian <https://l10n.elementaryos.org/projects/desktop/gala/"
 "ru/>\n"
 "Language: ru\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.10.4\n"
+"X-Generator: Weblate 5.11.4\n"
 "X-Launchpad-Export-Date: 2017-02-21 05:47+0000\n"
 
 #: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -279,16 +279,15 @@ msgstr "Снимок экрана от %s"
 
 #. / TRANSLATORS: %s represents a name of file manager
 #: src/ScreenshotManager.vala:170
-#, fuzzy, c-format
-#| msgid "Show in Files"
+#, c-format
 msgid "Show in %s"
-msgstr "Показать в Файлах"
+msgstr "Показать в %s"
 
 #. / TRANSLATORS: %s represents a name of image viewer
 #: src/ScreenshotManager.vala:176
 #, c-format
 msgid "Open in %s"
-msgstr ""
+msgstr "Открыть в %s"
 
 #: src/ScreenshotManager.vala:184 src/ScreenshotManager.vala:543
 msgid "Screenshot taken"

src/Widgets/MultitaskingView/WindowCloneContainer.vala

@@ -10,6 +10,7 @@
 public class Gala.WindowCloneContainer : ActorTarget {
     public signal void window_selected (Meta.Window window);
     public signal void requested_close ();
+    public signal void last_window_closed ();
 
     public int padding_top { get; set; default = 12; }
     public int padding_left { get; set; default = 12; }
@@ -105,6 +106,10 @@ public class Gala.WindowCloneContainer : ActorTarget {
                 break;
             }
         }
+
+        if (get_n_children () == 0) {
+            last_window_closed ();
+        }
     }
 
     /**

src/Widgets/WindowOverview.vala

@@ -134,6 +134,7 @@ public class Gala.WindowOverview : ActorTarget, RootTarget, ActivatableComponent
             };
             window_clone_container.window_selected.connect (thumb_selected);
             window_clone_container.requested_close.connect (() => close ());
+            window_clone_container.last_window_closed.connect (() => close ());
 
             add_child (window_clone_container);
         }

src/WindowManager.vala

@@ -937,6 +937,19 @@ namespace Gala {
                     if (window.can_close ())
                         flags |= WindowFlags.CAN_CLOSE;
 
+                    unowned var workspace = window.get_workspace ();
+                    if (workspace != null) {
+                        unowned var manager = window.display.get_workspace_manager ();
+                        var workspace_index = workspace.workspace_index;
+                        if (workspace_index != 0) {
+                            flags |= WindowFlags.ALLOWS_MOVE_LEFT;
+                        }
+
+                        if (workspace_index != manager.n_workspaces - 2 || Utils.get_n_windows (workspace) != 1) {
+                            flags |= WindowFlags.ALLOWS_MOVE_RIGHT;
+                        }
+                    }
+
                     daemon_manager.show_window_menu.begin (flags, x, y);
                     break;
                 case Meta.WindowMenuType.APP: