Merge branch 'main' into lenemter/cleanup-wayland-sockets

Author: leonardo-lemos

daemon-gtk3/DBus.vala

@@ -90,8 +90,8 @@ public class Gala.Daemon.DBus : GLib.Object {
         menu.attach_to_widget (window.content, null);
 
         Gdk.Rectangle rect = {
-            x,
-            y,
+            x / window.scale_factor,
+            y / window.scale_factor,
             0,
             0
         };

data/shaders/colorblindness-correction.vert

@@ -8,9 +8,16 @@
 uniform sampler2D tex;
 uniform int COLORBLIND_MODE;
 uniform float STRENGTH;
+uniform bool PAUSE_FOR_SCREENSHOT;
+
 void main() {
     vec4 c = texture2D(tex, cogl_tex_coord0_in.xy);
 
+    if (PAUSE_FOR_SCREENSHOT) {
+        cogl_color_out = c;
+        return;
+    }
+
     // RGB to LMS matrix
     float L = (17.8824f * c.r) + (43.5161f * c.g) + (4.11935f * c.b);
     float M = (3.45565f * c.r) + (27.1554f * c.g) + (3.86714f * c.b);

data/shaders/monochrome.vert

@@ -5,9 +5,16 @@
 
 uniform sampler2D tex;
 uniform float STRENGTH;
+uniform bool PAUSE_FOR_SCREENSHOT;
+
 void main() {
-    vec2 uv = cogl_tex_coord0_in.xy;
-    vec4 sample = texture2D (tex, uv);
+    vec4 sample = texture2D (tex, cogl_tex_coord0_in.xy);
+
+    if (PAUSE_FOR_SCREENSHOT) {
+        cogl_color_out = sample;
+        return;
+    }
+
     vec3 luminance = vec3 (0.2126, 0.7512, 0.0722);
     float gray = luminance.r * sample.r + luminance.g * sample.g + luminance.b * sample.b;
     cogl_color_out = vec4 (

lib/Constants.vala

@@ -35,17 +35,6 @@ namespace Gala {
         NUDGE = 360,
     }
 
-    public enum GestureAction {
-        NONE,
-        SWITCH_WORKSPACE,
-        SWITCH_WINDOWS,
-        MULTITASKING_VIEW,
-        DOCK,
-        ZOOM,
-        CLOSE_WINDOW,
-        N_ACTIONS
-    }
-
     /**
      * Used as a key for Object.set_data<bool> on Meta.Windows that should be
      * treated as notifications. Has to be set before the window is mapped.

src/Gestures/ActorTarget.vala renamed to lib/Gestures/ActorTarget.vala

@@ -20,7 +20,7 @@ namespace Gala {
     /**
      * Physical direction of the gesture. This direction doesn't follow natural scroll preferences.
      */
-    public enum GestureDirection {
+    private enum GestureDirection {
         UNKNOWN = 0,
 
         // GestureType.SWIPE and GestureType.SCROLL
@@ -34,7 +34,18 @@ namespace Gala {
         OUT = 6,
     }
 
-    public class Gesture {
+    public enum GestureAction {
+        NONE,
+        SWITCH_WORKSPACE,
+        SWITCH_WINDOWS,
+        MULTITASKING_VIEW,
+        DOCK,
+        ZOOM,
+        CLOSE_WINDOW,
+        N_ACTIONS
+    }
+
+    private class Gesture {
         public const float INVALID_COORD = float.MAX;
 
         public Clutter.EventType type;

src/Gestures/Gesture.vala renamed to lib/Gestures/Gesture.vala

@@ -5,7 +5,7 @@
  * Authored by: Leonhard Kargl <[email protected]>
  */
 
-public interface Gala.GestureBackend : Object {
+private interface Gala.GestureBackend : Object {
     public signal bool on_gesture_detected (Gesture gesture, uint32 timestamp);
     public signal void on_begin (double delta, uint64 time);
     public signal void on_update (double delta, uint64 time);

src/Gestures/GestureBackend.vala renamed to lib/Gestures/GestureBackend.vala

@@ -13,7 +13,7 @@
  * You shouldn't connect a notify to the progress directly though, but rather use a
  * {@link GestureTarget} implementation.
  * The {@link progress} can be seen as representing the state that the UI the gesture affects
- * is currently in (e.g. 0 for multitasking view closed, 1 for it opend, or 0 for first workspace,
+ * is currently in (e.g. 0 for multitasking view closed, 1 for it opened, or 0 for first workspace,
  * -1 for second, -2 for third, etc.). Therefore the progress often needs boundaries which can be
  * set with {@link overshoot_lower_clamp} and {@link overshoot_upper_clamp}. If the values are integers
  * it will be a hard boundary, if they are fractional it will slow the gesture progress when over the

src/Gestures/GestureController.vala renamed to lib/Gestures/GestureController.vala

@@ -19,7 +19,7 @@
 /**
  * Utility class to access the gesture settings. Easily accessible through GestureTracker.settings.
  */
-public class Gala.GestureSettings : Object {
+private class Gala.GestureSettings : Object {
     private static GLib.Settings gala_settings;
     private static GLib.Settings touchpad_settings;