Merge branch 'master' into leolost/workspace-switch-float-docks

elementary · Apr 15, 2024 · b30c920 · b30c920
2 parents c466566 + 5c68c1f
commit b30c920
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,7 +22,7 @@ jobs:
           - version: unstable
             mutter_pkg: libmutter-10-dev
           - version: development-target
-            mutter_pkg: libmutter-13-dev
+            mutter_pkg: libmutter-14-dev
     container:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 

diff --git a/src/HotCorners/Barrier.vala b/src/HotCorners/Barrier.vala
@@ -26,7 +26,6 @@ public class Gala.Barrier : Meta.Barrier {
      * the barrier to trigger again. Set to int.MAX to disallow retrigger.
      */
     public Barrier (
-        Meta.Display display,
         int x1,
         int y1,
         int x2,
@@ -38,7 +37,6 @@ public class Gala.Barrier : Meta.Barrier {
         int retrigger_delay
     ) {
         Object (
-            display: display,
             x1: x1,
             y1: y1,
             x2: x2,

diff --git a/src/HotCorners/HotCorner.vala b/src/HotCorners/HotCorner.vala
@@ -69,15 +69,15 @@ public class Gala.HotCorner : Object {
         var hdir = get_barrier_direction (hot_corner_position, Clutter.Orientation.HORIZONTAL);
 
         vertical_barrier = new Gala.Barrier (
-            display, vrect.x, vrect.y, vrect.x + vrect.width, vrect.y + vrect.height, vdir,
+            vrect.x, vrect.y, vrect.x + vrect.width, vrect.y + vrect.height, vdir,
             TRIGGER_PRESSURE_THRESHOLD,
             RELEASE_PRESSURE_THRESHOLD,
             RETRIGGER_PRESSURE_THRESHOLD,
             RETRIGGER_DELAY
         );
 
         horizontal_barrier = new Gala.Barrier (
-            display, hrect.x, hrect.y, hrect.x + hrect.width, hrect.y + hrect.height, hdir,
+            hrect.x, hrect.y, hrect.x + hrect.width, hrect.y + hrect.height, hdir,
             TRIGGER_PRESSURE_THRESHOLD,
             RELEASE_PRESSURE_THRESHOLD,
             RETRIGGER_PRESSURE_THRESHOLD,