Merge branch 'main' into leolost/fix-panel-flicker

Author: zeebok

data/gala.metainfo.xml.in

@@ -35,6 +35,7 @@
         </ul>
       </description>
       <issues>
+        <issue url="https://github.com/elementary/gala/issues/1737">Cursor only visible in window screenshots </issue>
         <issue url="https://github.com/elementary/gala/issues/1898">wayland: opening windows when overview is opened breaks a lot</issue>
         <issue url="https://github.com/elementary/gala/issues/2053">Window renders black</issue>
         <issue url="https://github.com/elementary/gala/issues/2067">Terminal and System Settings have generic icon in multitasking view on Wayland</issue>

src/ScreenshotManager.vala

@@ -394,10 +394,7 @@ namespace Gala {
 
             image = new Cairo.ImageSurface (Cairo.Format.ARGB32, image_width, image_height);
 
-            var paint_flags = Clutter.PaintFlag.NO_CURSORS;
-            if (include_cursor) {
-                paint_flags |= Clutter.PaintFlag.FORCE_CURSORS;
-            }
+            var paint_flags = include_cursor ? Clutter.PaintFlag.FORCE_CURSORS : Clutter.PaintFlag.NO_CURSORS;
 
             try {
                 if (GLib.ByteOrder.HOST == GLib.ByteOrder.LITTLE_ENDIAN) {

src/WindowManager.vala

@@ -2058,8 +2058,8 @@ namespace Gala {
                         continue;
                     }
 
-                    windows.prepend (actor);
-                    parents.prepend (actor.get_parent ());
+                    windows.append (actor);
+                    parents.append (actor.get_parent ());
 
                     clutter_actor_reparent (actor, static_windows);
                     actor.set_translation (-clone_offset_x, -clone_offset_y, 0);