Merge branch 'main' into lenemter/reduce-window-changed-calls

Author: lenemter

po/ie.po

@@ -8,13 +8,16 @@ msgstr ""
 "Project-Id-Version: gala 3.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2025-03-12 22:19+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2025-03-20 07:55+0000\n"
+"Last-Translator: Carmina16 <[email protected]>\n"
+"Language-Team: Occidental <https://l10n.elementaryos.org/projects/desktop/"
+"gala/ie/>\n"
 "Language: ie\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.10.4\n"
 
 #: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
 msgid "Change Wallpaper…"
@@ -70,7 +73,7 @@ msgstr ""
 
 #: daemon-gtk3/WindowMenu.vala:105 daemon/WindowMenu.vala:124
 msgid "Close"
-msgstr ""
+msgstr "Cluder"
 
 #: daemon-gtk3/WindowMenu.vala:138 daemon/WindowMenu.vala:167
 msgid "Untile"
@@ -100,7 +103,7 @@ msgstr ""
 
 #: data/gala.metainfo.xml.in:24
 msgid "elementary, Inc."
-msgstr ""
+msgstr "elementary, Inc."
 
 #: data/gala.metainfo.xml.in:32 data/gala.metainfo.xml.in:63
 #: data/gala.metainfo.xml.in:76 data/gala.metainfo.xml.in:91
@@ -277,17 +280,17 @@ msgstr ""
 #, c-format
 msgid "Changes will automatically revert after %i second."
 msgid_plural "Changes will automatically revert after %i seconds."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Li modificationes va esser revertet pos %i seconde."
+msgstr[1] "Li modificationes va esser revertet pos %i secondes."
 
 #: src/WindowManager.vala:1742
 msgid "Keep new display settings?"
-msgstr ""
+msgstr "Reterner li nov parametres del ecran?"
 
 #: src/WindowManager.vala:1746
 msgid "Keep Settings"
-msgstr ""
+msgstr "Retener"
 
 #: src/WindowManager.vala:1747
 msgid "Use Previous Settings"
-msgstr ""
+msgstr "Usar li precedent"

src/WindowManager.vala

@@ -334,6 +334,7 @@ namespace Gala {
             Meta.KeyBinding.set_custom_handler ("move-to-workspace-right", (Meta.KeyHandlerFunc) handle_move_to_workspace);
 
             for (int i = 1; i < 13; i++) {
+                Meta.KeyBinding.set_custom_handler ("switch-to-workspace-%d".printf (i), (Meta.KeyHandlerFunc) handle_switch_to_workspace);
                 Meta.KeyBinding.set_custom_handler ("move-to-workspace-%d".printf (i), (Meta.KeyHandlerFunc) handle_move_to_workspace);
             }
 
@@ -465,8 +466,9 @@ namespace Gala {
                 var direction = (name == "move-to-workspace-left" ? Meta.MotionDirection.LEFT : Meta.MotionDirection.RIGHT);
                 target_workspace = active_workspace.get_neighbor (direction);
             } else {
-                var workspace_number = int.parse (name.offset ("move-to-workspace-".length));
-                var workspace_index = workspace_number - 1;
+                var workspace_number = int.parse (name.offset ("move-to-workspace-".length)) - 1;
+                var workspace_index = workspace_number.clamp (0, workspace_manager.n_workspaces - 1);
+
                 target_workspace = workspace_manager.get_workspace_by_index (workspace_index);
             }
 
@@ -491,8 +493,24 @@ namespace Gala {
         [CCode (instance_pos = -1)]
         private void handle_switch_to_workspace (Meta.Display display, Meta.Window? window,
             Clutter.KeyEvent event, Meta.KeyBinding binding) {
-            var direction = (binding.get_name () == "switch-to-workspace-left" ? Meta.MotionDirection.LEFT : Meta.MotionDirection.RIGHT);
-            switch_to_next_workspace (direction, event.get_time ());
+            unowned var name = binding.get_name ();
+
+            if (name == "switch-to-workspace-left" || name == "switch-to-workspace-right") {
+                var direction = (name == "switch-to-workspace-left" ? Meta.MotionDirection.LEFT : Meta.MotionDirection.RIGHT);
+                switch_to_next_workspace (direction, event.get_time ());
+            } else {
+                unowned var workspace_manager = get_display ().get_workspace_manager ();
+
+                var workspace_number = int.parse (name.offset ("switch-to-workspace-".length)) - 1;
+                var workspace_index = workspace_number.clamp (0, workspace_manager.n_workspaces - 1);
+
+                var workspace = workspace_manager.get_workspace_by_index (workspace_index);
+                if (workspace == null) {
+                    return;
+                }
+
+                workspace.activate (event.get_time ());
+            }
         }
 
         [CCode (instance_pos = -1)]