Add Gnome 47 support

Author: vchlum

extension/extensionmenu.js

@@ -40,6 +40,8 @@ import GLib from 'gi://GLib';
 import Meta from 'gi://Meta';
 import Shell from 'gi://Shell';
 import Mtk from 'gi://Mtk';
+import Cogl from 'gi://Cogl';
+import * as Config from 'resource:///org/gnome/shell/misc/config.js';
 import * as Slider from 'resource:///org/gnome/shell/ui/slider.js';
 import * as Main from 'resource:///org/gnome/shell/ui/main.js';
 import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
@@ -53,6 +55,8 @@ import * as AreaSelector from './areaselector.js';
 import * as Queue from './queue.js';
 import * as Utils from './utils.js';
 
+const ShellVersion = parseFloat(Config.PACKAGE_VERSION);
+
 const StreamState = {
     STOPPED: 0,
     STARTING: 1,
@@ -3968,12 +3972,21 @@ export const PhueMenu = GObject.registerClass({
      * @param {Array} array with RGB
      */
     _setSwitchColor(object, [r, g, b]) {
-        let color = new Clutter.Color({
-            red: r,
-            green: g,
-            blue: b,
-            alpha: 255
-        });
+        let color;
+        if (ShellVersion >= 47) {
+            color = new Cogl.Color();
+            color.red = r;
+            color.green = g;
+            color.blue = b;
+            color.alpha = 255;
+        } else {
+            color = new Clutter.Color({
+                red: r,
+                green: g,
+                blue: b,
+                alpha: 255
+            });
+        }
 
         object.clear_effects();
 

extension/metadata.json

@@ -11,7 +11,8 @@
     },
     "shell-version": [
       "45",
-      "46"
+      "46",
+      "47"
     ],
     "gettext-domain": "hue-lights",
     "url": "https://github.com/vchlum/hue-lights"

extension/phuepanelmenu.js

@@ -38,12 +38,16 @@ import GLib from 'gi://GLib';
 import St from 'gi://St';
 import GObject from 'gi://GObject';
 import Clutter from 'gi://Clutter';
+import Cogl from 'gi://Cogl';
+import * as Config from 'resource:///org/gnome/shell/misc/config.js';
 import * as Main from 'resource:///org/gnome/shell/ui/main.js';
 import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
 import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
 import * as Utils from './utils.js';
 import {Extension, gettext} from 'resource:///org/gnome/shell/extensions/extension.js';
 
+const ShellVersion = parseFloat(Config.PACKAGE_VERSION);
+
 const __ = gettext;
 
 const PhueMenuPosition = {
@@ -157,22 +161,38 @@ export const PhuePanelMenu = GObject.registerClass({
 
             case PhueIconPack.BRIGHT:
 
-                color = new Clutter.Color({
-                    red: 237,
-                    green: 237,
-                    blue: 237,
-                    alpha: 255
-                });
+                if (ShellVersion >= 47) {
+                    color = new Cogl.Color();
+                    color.red = 237;
+                    color.green = 237;
+                    color.blue = 237;
+                    color.alpha = 255;
+                } else {
+                    color = new Clutter.Color({
+                        red: 237,
+                        green: 237,
+                        blue: 237,
+                        alpha: 255
+                    });
+                }
                 break;
 
             case PhueIconPack.DARK:
 
-                color = new Clutter.Color({
-                    red: 40,
-                    green: 40,
-                    blue: 40,
-                    alpha: 255
-                });
+                if (ShellVersion >= 47) {
+                    color = new Cogl.Color();
+                    color.red = 40;
+                    color.green = 40;
+                    color.blue = 40;
+                    color.alpha = 255;
+                } else {
+                    color = new Clutter.Color({
+                        red: 40,
+                        green: 40,
+                        blue: 40,
+                        alpha: 255
+                    });
+                }
                 break;
 
             default:

extension/phuescreenshot.js

@@ -33,9 +33,13 @@
  * THE SOFTWARE.
  */
 
- import Shell from 'gi://Shell';
- import GObject from 'gi://GObject';
- import Clutter from 'gi://Clutter';
+import Shell from 'gi://Shell';
+import GObject from 'gi://GObject';
+import Clutter from 'gi://Clutter';
+import Cogl from 'gi://Cogl';
+import * as Config from 'resource:///org/gnome/shell/misc/config.js';
+
+const ShellVersion = parseFloat(Config.PACKAGE_VERSION);
 
 /**
  * PhueScreenshot class for taking screenshots
@@ -63,11 +67,16 @@ export const PhueScreenshot =  GObject.registerClass({
      * @return {Object} color
      */
     async getColorPixel(x, y) {
-        let color = new Clutter.Color();
+        let color;
+        if (ShellVersion >= 47) {
+            color = new Cogl.Color();
+        } else {
+            color = new Clutter.Color();
+        }
         color.red = 0;
         color.green = 0;
         color.blue = 0;
-        color.alfa = 0;
+        color.alpha = 0;
 
         if (!this.pixelWithinScreen(x, y)) {
             return color;