Merge pull request #369 from Schneegans/feature/gnome-48

Add support for GNOME 48

Author: Schneegans

.github/workflows/badges.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Download cloc
         run: sudo apt-get update -y && sudo apt-get install -y cloc
       - name: Get the Numbers

.github/workflows/checks.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Download Clang-Format
         run: |
           sudo apt update -qq
@@ -33,7 +33,7 @@ jobs:
     name: Check Compliance with REUSE Specification
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: REUSE Compliance Check
         uses: fsfe/reuse-action@v1
 
@@ -43,12 +43,12 @@ jobs:
     if: github.event_name == 'pull_request'
     steps:
       - name: Checkout Current Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: current
           ref: ${{ github.ref }}
       - name: Checkout Base Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: base
           ref: ${{ github.base_ref }}
@@ -74,7 +74,7 @@ jobs:
     name: Run ShellCheck
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run ShellCheck
         run: |
           find $GITHUB_WORKSPACE -type f -and \( -name "*.sh" \) | xargs shellcheck
@@ -95,21 +95,21 @@ jobs:
           - "gnome-xsession"
           - "gnome-wayland-nested"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Download Dependencies
         run: |
           sudo apt update -qq
-          sudo apt install gettext -qq
+          sudo apt install gettext imagemagick libglib2.0-dev -qq
       - name: Build Fly-Pie
         run: make
       - name: Test Fly-Pie
         run: sudo $GITHUB_WORKSPACE/tests/run-test.sh -v ${{ matrix.version }} -s ${{ matrix.session }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: log_${{ matrix.version }}_${{ matrix.session }}
           path: fail.log
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: screen_${{ matrix.version }}_${{ matrix.session }}

.github/workflows/deploy.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install Dependencies
         run: |
           sudo apt-get update -q
@@ -30,4 +30,4 @@ jobs:
           asset_name: [email protected]
           tag: ${{ github.ref }}
           overwrite: true
-          draft: true
+          prerelease: true

docs/changelog.md

@@ -9,6 +9,15 @@ SPDX-License-Identifier: CC-BY-4.0
 
 # Changelog of Fly-Pie
 
+## [unreleased]
+
+**Release Date:** TBD
+
+#### Enhancements
+
+- Ported the extension to GNOME 48.
+- Several translation updates. Thanks to all the translators!
+
 ## [Fly-Pie 27](https://github.com/schneegans/fly-pie/releases/tag/v27)
 
 **Release Date:** 2024-08-23

metadata.json

@@ -1,19 +1,15 @@
 {
-    "uuid": "[email protected]",
-    "description": "A marking menu which can be used to launch applications, simulate hotkeys, open URLs and much more. Once installed, press Ctrl+Space to open the default menu. Open the preferences dialog for an interactive tutorial and for creating custom menus!",
-    "name": "Fly-Pie",
-    "donations": {
-        "kofi": "schneegans",
-        "github": "schneegans",
-        "paypal": "simonschneegans"
-    },
-    "gettext-domain": "flypie",
-    "settings-schema": "org.gnome.shell.extensions.flypie",
-    "shell-version": [
-        "45",
-        "46",
-        "47"
-    ],
-    "url": "https://github.com/Schneegans/Fly-Pie",
-    "version": 27
-}
+  "uuid": "[email protected]",
+  "description": "A marking menu which can be used to launch applications, simulate hotkeys, open URLs and much more. Once installed, press Ctrl+Space to open the default menu. Open the preferences dialog for an interactive tutorial and for creating custom menus!",
+  "name": "Fly-Pie",
+  "donations": {
+    "kofi": "schneegans",
+    "github": "schneegans",
+    "paypal": "simonschneegans"
+  },
+  "gettext-domain": "flypie",
+  "settings-schema": "org.gnome.shell.extensions.flypie",
+  "shell-version": ["45", "46", "47", "48"],
+  "url": "https://github.com/Schneegans/Fly-Pie",
+  "version": 28
+}

prefs.js

@@ -196,6 +196,15 @@ export default class FlyPiePreferences extends ExtensionPreferences {
 
     this._pages.forEach(page => {
       window.add(page);
+
+      // Starting with GNOME 48 there is an additional scrolled windo in the adw
+      // preference pages which we do not want. We simply hide it.
+      if (utils.shellVersionIsAtLeast(48, 'alpha')) {
+        const scrolledWindow = this._findChildByType(page, Gtk.ScrolledWindow);
+        if (scrolledWindow) {
+          scrolledWindow.visible = false;
+        }
+      }
     });
   }
 

src/extension/Background.js

@@ -193,7 +193,12 @@ class Background extends Clutter.Actor {
   // The open() method above does not really show the background; it's still translucent.
   // The actual revealing is done by this method.
   reveal() {
-    Meta.disable_unredirect_for_display(global.display);
+    // Since GNOME 48 this is a "global" method.
+    if (Meta.disable_unredirect_for_display) {
+      Meta.disable_unredirect_for_display(global.display);
+    } else {
+      global.compositor.disable_unredirect();
+    }
     this.ease({
       opacity: 255,
       duration: this._settings.get_double('easing-duration') * 1000,
@@ -220,7 +225,12 @@ class Background extends Clutter.Actor {
       duration: this._settings.get_double('easing-duration') * 1000,
       mode: Clutter.AnimationMode.EASE_OUT_QUAD,
       onStopped: () => {
-        Meta.enable_unredirect_for_display(global.display);
+        // Since GNOME 48 this is a "global" method.
+        if (Meta.disable_unredirect_for_display) {
+          Meta.enable_unredirect_for_display(global.display);
+        } else {
+          global.compositor.enable_unredirect();
+        }
 
         // Hide completely once the opacity has been faded to zero.
         this.visible = false;

src/extension/SelectionWedges.js

@@ -16,6 +16,7 @@ import Clutter from 'gi://Clutter';
 import GObject from 'gi://GObject';
 import Cairo from 'gi://cairo';
 import St from 'gi://St';
+import Cogl from 'gi://Cogl';
 
 import * as utils from '../common/utils.js';
 
@@ -103,7 +104,8 @@ class SelectionWedges extends Clutter.Actor {
         // faster than a Clutter.Canvas.
         this._wedgeActor  = new Clutter.Actor();
         this._wedgeShader = new Clutter.ShaderEffect({
-          shader_type: Clutter.ShaderType.FRAGMENT_SHADER,
+          shader_type: Cogl.ShaderType ? Cogl.ShaderType.FRAGMENT :
+                                         Clutter.ShaderType.FRAGMENT_SHADER,
         });
 
         // This shader could be simplified by using vec4's for the colors, but I did not