Merge branch 'master' into clutter-desktop-menu

elementary · Nov 11, 2023 · e9c3a2e · e9c3a2e
2 parents e94192f + 5fc8281
commit e9c3a2e
Show file tree

Hide file tree

Showing 221 changed files with 8,418 additions and 4,817 deletions.
diff --git a/data/gala.gschema.xml b/data/gala.gschema.xml
@@ -7,11 +7,10 @@
     <value nick="minimize-current" value="3" />
     <value nick="open-launcher" value="4" />
     <value nick="custom-command" value="5" />
-    <value nick="window-overview" value="6" />
-    <value nick="window-overview-all" value="7" />
-    <value nick="switch-to-workspace-previous" value="8" />
-    <value nick="switch-to-workspace-next" value="9" />
-    <value nick="switch-to-workspace-last" value="10" />
+    <value nick="window-overview-all" value="6" />
+    <value nick="switch-to-workspace-previous" value="7" />
+    <value nick="switch-to-workspace-next" value="8" />
+    <value nick="switch-to-workspace-last" value="9" />
   </enum>
   <enum id="GalaWindowOverviewType">
     <value nick='grid' value='0'/>
@@ -148,8 +147,8 @@
       <summary>Zoom out</summary>
     </key>
     <key type="as" name="expose-windows">
-      <default><![CDATA[['<Super>w']]]></default>
-      <summary>Shortcut to open the window overview</summary>
+      <default><![CDATA[['']]]></default>
+      <summary>DEPRECATED: This key is deprecated and ignored</summary>
       <description></description>
     </key>
     <key type="as" name="expose-all-windows">
@@ -229,7 +228,7 @@
     </key>
     <key type="s" name="workspace-switcher-background">
       <default>''</default>
-      <summary>Background-image used in the workspace-switcher</summary>
+      <summary>DEPRECATED: This key is deprecated and ignored.</summary>
     </key>
   </schema>
 
@@ -355,6 +354,7 @@
   <enum id="GestureSwipeHorizontal">
     <value nick="none" value="0" />
     <value nick="switch-to-workspace" value="1" />
+    <value nick="move-to-workspace" value="2" />
   </enum>
   <enum id="GestureSwipeUp">
     <value nick="none" value="0" />

diff --git a/data/gala.metainfo.xml.in b/data/gala.metainfo.xml.in
@@ -25,16 +25,28 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
-    <release version="7.1.3" date="2023-09-13" urgency="medium">
+    <release version="7.1.3" date="2023-11-09" urgency="medium">
       <description>
         <p>Improvements:</p>
         <ul>
+          <li>Changing the wallpaper or going to sleep respects the "Reduce Motion" option</li>
+          <li>Use appropriate drag-and-drop pointers when moving windows</li>
+          <li>Fix the issue when gestures in the multitasking view might stop working</li>
+          <li>Improve dynamic workspaces behaviour with multiple monitors</li>
           <li>Updated translations</li>
         </ul>
       </description>
       <issues>
-        <issue url="https://github.com/elementary/gala/issues/1774">Scheduled switch to dark style does not dim the wallpaper after cold reboot on elementary OS 7.1</issue>
+        <issue url="https://github.com/elementary/gala/issues/506">After login there is always 2 unpopulated workspaces open.</issue>
+        <issue url="https://github.com/elementary/gala/issues/695">Wrong workspaces behavior</issue>
+        <issue url="https://github.com/elementary/gala/issues/1109">Use gestures for "move to workspace"</issue>
         <issue url="https://github.com/elementary/gala/issues/1261">Alt + Shift unnecessarily blocked when there is only one keyboard layout</issue>
+        <issue url="https://github.com/elementary/gala/issues/1518">Multitasking view breaks when switching displays &amp; strange Wingpanel position</issue>
+        <issue url="https://github.com/elementary/gala/issues/1750">Disconnecting external monitor breaks the multi-tasking view</issue>
+        <issue url="https://github.com/elementary/gala/issues/1753">Workspace wallpaper's aspect ratio with different monitors</issue>
+        <issue url="https://github.com/elementary/gala/discussions/1764">Counter Strike 2 causes segfault in libmutter on exit</issue>
+        <issue url="https://github.com/elementary/gala/issues/1774">Scheduled switch to dark style does not dim the wallpaper after cold reboot on elementary OS 7.1</issue>
+        <issue url="https://github.com/elementary/gala/issues/1783">Notifications appear in the middle of the screen</issue>
       </issues>
     </release>
 

diff --git a/lib/ActivatableComponent.vala b/lib/ActivatableComponent.vala
@@ -27,8 +27,7 @@ namespace Gala {
          * The component was requested to be opened.
          *
          * @param hints The hashmap may contain special parameters that are useful
-         *              to the component. Currently, the only one implemented is the
-         *              'all-windows' hint to the windowoverview.
+         *              to the component.
          */
         public abstract void open (HashTable<string,Variant>? hints = null);
 

diff --git a/lib/DragDropAction.vala b/lib/DragDropAction.vala
@@ -291,7 +291,7 @@ namespace Gala {
                     if (!dragging && clicked) {
                         var drag_threshold = Clutter.Settings.get_default ().dnd_drag_threshold;
                         if (Math.fabsf (last_x - x) > drag_threshold || Math.fabsf (last_y - y) > drag_threshold) {
-                            handle = drag_begin (x, y);
+                            handle = drag_begin (last_x, last_y);
                             if (handle == null) {
                                 ungrab_actor ();
                                 critical ("No handle has been returned by the started signal, aborting drag.");

diff --git a/lib/Utils.vala b/lib/Utils.vala
@@ -261,16 +261,20 @@ namespace Gala {
          *
          * @param workspace The workspace on which to count the windows
          */
-        public static uint get_n_windows (Meta.Workspace workspace) {
+        public static uint get_n_windows (Meta.Workspace workspace, bool on_primary = false) {
             var n = 0;
-            foreach (weak Meta.Window window in workspace.list_windows ()) {
-                if (window.on_all_workspaces)
+            foreach (unowned var window in workspace.list_windows ()) {
+                if (window.on_all_workspaces) {
                     continue;
+                }
+
                 if (
-                    window.window_type == Meta.WindowType.NORMAL ||
-                    window.window_type == Meta.WindowType.DIALOG ||
-                    window.window_type == Meta.WindowType.MODAL_DIALOG)
+                    (window.window_type == Meta.WindowType.NORMAL
+                    || window.window_type == Meta.WindowType.DIALOG
+                    || window.window_type == Meta.WindowType.MODAL_DIALOG)
+                    && (!on_primary || (on_primary && window.is_on_primary_monitor ()))) {
                     n ++;
+                }
             }
 
             return n;

diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 project('gala',
     'c', 'vala',
-    version: '7.1.2',
+    version: '7.1.3',
     meson_version: '>= 0.58.0',
     license: 'GPL3',
 )

diff --git a/plugins/pip/PopupWindow.vala b/plugins/pip/PopupWindow.vala
@@ -7,7 +7,6 @@
 public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     private int button_size;
     private int container_margin;
-    private const int SHADOW_SIZE = 100;
     private const uint FADE_OUT_TIMEOUT = 200;
     private const float MINIMUM_SCALE = 0.1f;
     private const float MAXIMUM_SCALE = 1.0f;
@@ -88,7 +87,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         container = new Clutter.Actor ();
         container.reactive = true;
         container.set_scale (0.35f, 0.35f);
-        container.add_effect (new ShadowEffect (SHADOW_SIZE) { css_class = "window-clone" });
+        container.add_effect (new ShadowEffect (55) { css_class = "window-clone" });
         container.add_child (clone);
         container.add_action (move_action);
 
@@ -218,12 +217,15 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     }
 
     private Clutter.Actor on_move_begin () {
+        wm.get_display ().set_cursor (Meta.Cursor.DND_IN_DRAG);
+
         return this;
     }
 
     private void on_move_end () {
         reactive = true;
         update_screen_position ();
+        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
     }
 
 #if HAS_MUTTER45
@@ -245,6 +247,8 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         grab = resize_button.get_stage ().grab (resize_button);
         resize_button.event.connect (on_resize_event);
 
+        wm.get_display ().set_cursor (Meta.Cursor.SE_RESIZE);
+
         return Clutter.EVENT_PROPAGATE;
     }
 
@@ -303,6 +307,8 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         resizing = false;
 
         update_screen_position ();
+
+        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
     }
 
     private void on_allocation_changed () {

diff --git a/po/aa.po b/po/aa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gala 3.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
-"POT-Creation-Date: 2023-09-29 22:16+0000\n"
+"POT-Creation-Date: 2023-11-07 19:57+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,27 +47,27 @@ msgstr ""
 msgid "Screenshot taken"
 msgstr ""
 
-#: src/WindowManager.vala:2211
+#: src/WindowManager.vala:2251
 #, c-format
 msgid "Changes will automatically revert after %i second."
 msgid_plural "Changes will automatically revert after %i seconds."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/WindowManager.vala:2218
+#: src/WindowManager.vala:2258
 msgid "Keep new display settings?"
 msgstr ""
 
-#: src/WindowManager.vala:2222
+#: src/WindowManager.vala:2262
 msgid "Keep Settings"
 msgstr ""
 
-#: src/WindowManager.vala:2223
+#: src/WindowManager.vala:2263
 msgid "Use Previous Settings"
 msgstr ""
 
 #. / TRANSLATORS: %s represents a timestamp here
-#: src/WindowManager.vala:2265
+#: src/WindowManager.vala:2305
 #, c-format
 msgid "Screenshot from %s"
 msgstr ""
@@ -150,59 +150,77 @@ msgstr ""
 msgid "elementary, Inc."
 msgstr ""
 
-#: data/gala.metainfo.xml.in:30 data/gala.metainfo.xml.in:42
-#: data/gala.metainfo.xml.in:58 data/gala.metainfo.xml.in:73
-#: data/gala.metainfo.xml.in:85 data/gala.metainfo.xml.in:110
+#: data/gala.metainfo.xml.in:30 data/gala.metainfo.xml.in:55
+#: data/gala.metainfo.xml.in:71 data/gala.metainfo.xml.in:86
+#: data/gala.metainfo.xml.in:98 data/gala.metainfo.xml.in:123
 msgid "Improvements:"
 msgstr ""
 
-#: data/gala.metainfo.xml.in:32 data/gala.metainfo.xml.in:45
-#: data/gala.metainfo.xml.in:60 data/gala.metainfo.xml.in:75
-#: data/gala.metainfo.xml.in:93 data/gala.metainfo.xml.in:115
+#: data/gala.metainfo.xml.in:32
+msgid ""
+"Changing the wallpaper or going to sleep respects the \"Reduce Motion\" "
+"option"
+msgstr ""
+
+#: data/gala.metainfo.xml.in:33
+msgid "Use appropriate drag-and-drop pointers when moving windows"
+msgstr ""
+
+#: data/gala.metainfo.xml.in:34
+msgid "Fix the issue when gestures in the multitasking view might stop working"
+msgstr ""
+
+#: data/gala.metainfo.xml.in:35
+msgid "Improve dynamic workspaces behaviour with multiple monitors"
+msgstr ""
+
+#: data/gala.metainfo.xml.in:36 data/gala.metainfo.xml.in:58
+#: data/gala.metainfo.xml.in:73 data/gala.metainfo.xml.in:88
+#: data/gala.metainfo.xml.in:106 data/gala.metainfo.xml.in:128
 msgid "Updated translations"
 msgstr ""
 
-#: data/gala.metainfo.xml.in:44
+#: data/gala.metainfo.xml.in:57
 msgid "Improve handling of move-to-workspace shortcut"
 msgstr ""
 
-#: data/gala.metainfo.xml.in:87
+#: data/gala.metainfo.xml.in:100
 msgid ""
 "Set the keyboard layout correctly at startup so that the indicator matches "
 "the selected layout"
 msgstr ""
 
-#: data/gala.metainfo.xml.in:88
+#: data/gala.metainfo.xml.in:101
 msgid "Fix screenshot keyboard shortcuts while in Multitasking View"
 msgstr ""
 
-#: data/gala.metainfo.xml.in:89
+#: data/gala.metainfo.xml.in:102
 msgid ""
 "Correctly set the active workspace highlight when entering Multitasking View "
 "and animate 1:1 with multitouch gestures"
 msgstr ""
 
-#: data/gala.metainfo.xml.in:90
+#: data/gala.metainfo.xml.in:103
 msgid "Update panel color after dimming the wallpaper"
 msgstr ""
 
-#: data/gala.metainfo.xml.in:91
+#: data/gala.metainfo.xml.in:104
 msgid "Scale rounded corners per-display"
 msgstr ""
 
-#: data/gala.metainfo.xml.in:92
+#: data/gala.metainfo.xml.in:105
 msgid "Support fractional scaling"
 msgstr ""
 
-#: data/gala.metainfo.xml.in:112
+#: data/gala.metainfo.xml.in:125
 msgid "Performance improvements"
 msgstr ""
 
-#: data/gala.metainfo.xml.in:113
+#: data/gala.metainfo.xml.in:126
 msgid "Remove texture from Multitasking View"
 msgstr ""
 
-#: data/gala.metainfo.xml.in:114
+#: data/gala.metainfo.xml.in:127
 msgid "Avoid accidentally selecting windows in the window switcher"
 msgstr ""