From 645d2dafff1ae54bc0114cd05b81275cd8684b95 Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Wed, 12 Feb 2025 14:06:10 +0100 Subject: [PATCH] :fire: Remove deprecated use of Clutter.Image --- src/effects/BrokenGlass.js | 4 ++-- src/effects/PaintBrush.js | 4 ++-- src/effects/SnapOfDisintegration.js | 4 ++-- src/effects/TRexAttack.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/effects/BrokenGlass.js b/src/effects/BrokenGlass.js index f31efb7..955fd6d 100644 --- a/src/effects/BrokenGlass.js +++ b/src/effects/BrokenGlass.js @@ -20,7 +20,7 @@ import * as utils from '../utils.js'; // preferences process. They are used only in the creator function of the ShaderFactory // which is only called within GNOME Shell's process. const ShaderFactory = await utils.importInShellOnly('./ShaderFactory.js'); -const Clutter = await utils.importInShellOnly('gi://Clutter'); +const St = await utils.importInShellOnly('gi://St'); const GdkPixbuf = await utils.importInShellOnly('gi://GdkPixbuf'); const Cogl = await utils.importInShellOnly('gi://Cogl'); @@ -56,7 +56,7 @@ export default class Effect { // Create the texture in the first call. if (!this._shardTexture) { const shardData = GdkPixbuf.Pixbuf.new_from_resource('/img/shards.png'); - this._shardTexture = new Clutter.Image(); + this._shardTexture = new St.ImageContent(); this._shardTexture.set_data(shardData.get_pixels(), Cogl.PixelFormat.RGB_888, shardData.width, shardData.height, shardData.rowstride); diff --git a/src/effects/PaintBrush.js b/src/effects/PaintBrush.js index 4a90729..94d7e2d 100644 --- a/src/effects/PaintBrush.js +++ b/src/effects/PaintBrush.js @@ -20,7 +20,7 @@ import * as utils from '../utils.js'; // preferences process. They are used only in the creator function of the ShaderFactory // which is only called within GNOME Shell's process. const ShaderFactory = await utils.importInShellOnly('./ShaderFactory.js'); -const Clutter = await utils.importInShellOnly('gi://Clutter'); +const St = await utils.importInShellOnly('gi://St'); const GdkPixbuf = await utils.importInShellOnly('gi://GdkPixbuf'); const Cogl = await utils.importInShellOnly('gi://Cogl'); @@ -46,7 +46,7 @@ export default class Effect { // Create the texture in the first call. if (!this._brushTexture) { const brushData = GdkPixbuf.Pixbuf.new_from_resource('/img/brush.png'); - this._brushTexture = new Clutter.Image(); + this._brushTexture = new St.ImageContent(); this._brushTexture.set_data(brushData.get_pixels(), Cogl.PixelFormat.RGBA_8888_PRE, brushData.width, brushData.height, brushData.rowstride); diff --git a/src/effects/SnapOfDisintegration.js b/src/effects/SnapOfDisintegration.js index 7a76611..86126a9 100644 --- a/src/effects/SnapOfDisintegration.js +++ b/src/effects/SnapOfDisintegration.js @@ -20,7 +20,7 @@ import * as utils from '../utils.js'; // preferences process. They are used only in the creator function of the ShaderFactory // which is only called within GNOME Shell's process. const ShaderFactory = await utils.importInShellOnly('./ShaderFactory.js'); -const Clutter = await utils.importInShellOnly('gi://Clutter'); +const St = await utils.importInShellOnly('gi://St'); const GdkPixbuf = await utils.importInShellOnly('gi://GdkPixbuf'); const Cogl = await utils.importInShellOnly('gi://Cogl'); @@ -50,7 +50,7 @@ export default class Effect { // Create the texture in the first call. if (!this._dustTexture) { const dustData = GdkPixbuf.Pixbuf.new_from_resource('/img/dust.png'); - this._dustTexture = new Clutter.Image(); + this._dustTexture = new St.ImageContent(); this._dustTexture.set_data(dustData.get_pixels(), Cogl.PixelFormat.RGB_888, dustData.width, dustData.height, dustData.rowstride); } diff --git a/src/effects/TRexAttack.js b/src/effects/TRexAttack.js index 617453c..111335c 100644 --- a/src/effects/TRexAttack.js +++ b/src/effects/TRexAttack.js @@ -20,7 +20,7 @@ import * as utils from '../utils.js'; // preferences process. They are used only in the creator function of the ShaderFactory // which is only called within GNOME Shell's process. const ShaderFactory = await utils.importInShellOnly('./ShaderFactory.js'); -const Clutter = await utils.importInShellOnly('gi://Clutter'); +const St = await utils.importInShellOnly('gi://St'); const GdkPixbuf = await utils.importInShellOnly('gi://GdkPixbuf'); const Cogl = await utils.importInShellOnly('gi://Cogl'); @@ -46,7 +46,7 @@ export default class Effect { // Create the texture in the first call. if (!this._clawTexture) { const clawData = GdkPixbuf.Pixbuf.new_from_resource('/img/claws.png'); - this._clawTexture = new Clutter.Image(); + this._clawTexture = new St.ImageContent(); this._clawTexture.set_data(clawData.get_pixels(), Cogl.PixelFormat.RGB_888, clawData.width, clawData.height, clawData.rowstride); }