From 9d5be1660d8f74038ebed3d74fdbc809e43787ae Mon Sep 17 00:00:00 2001 From: Nippy Date: Fri, 9 Oct 2026 17:23:53 +0200 Subject: gnome fix --- .../blur-my-shell@aunetx/effects/upscale.js | 78 +++++++++++++++------- 1 file changed, 55 insertions(+), 23 deletions(-) (limited to 'raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/effects/upscale.js') diff --git a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/effects/upscale.js b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/effects/upscale.js index fb719c3..d29ba8c 100644 --- a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/effects/upscale.js +++ b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/effects/upscale.js @@ -1,18 +1,18 @@ import GObject from 'gi://GObject'; import * as utils from '../conveniences/utils.js'; +import * as uniforms from '../conveniences/shader_uniforms.js'; const Shell = await utils.import_in_shell_only('gi://Shell'); const Clutter = await utils.import_in_shell_only('gi://Clutter'); const SHADER_FILENAME = 'upscale.glsl'; +const SHADER_SOURCE = utils.get_shader_source(Shell, SHADER_FILENAME, import.meta.url); const DEFAULT_PARAMS = { - factor: 8, width: 0, height: 0 + factor: 8, opacity_factor: 1, width: 0, height: 0 }; -export const UpscaleEffect = utils.IS_IN_PREFERENCES ? - { default_params: DEFAULT_PARAMS } : - new GObject.registerClass({ +const UPSCALE_EFFECT_META = { GTypeName: "UpscaleEffect", Properties: { 'factor': GObject.ParamSpec.int( @@ -23,6 +23,14 @@ export const UpscaleEffect = utils.IS_IN_PREFERENCES ? 0, 64, 8, ), + 'opacity_factor': GObject.ParamSpec.double( + `opacity_factor`, + `Opacity factor`, + `Opacity factor`, + GObject.ParamFlags.READWRITE, + 0.0, 1.0, + 1.0, + ), 'width': GObject.ParamSpec.double( `width`, `Width`, @@ -40,16 +48,17 @@ export const UpscaleEffect = utils.IS_IN_PREFERENCES ? 0.0, ) } - }, class UpscaleEffect extends Clutter.ShaderEffect { +}; + +const UpscaleEffectClass = utils.IS_IN_PREFERENCES ? null : class UpscaleEffect extends Clutter.ShaderEffect { + constructor(params) { - super(params); + super(); + + utils.initialize_shader_effect(this, SHADER_SOURCE); - utils.setup_params(this, params); - // set shader source - this._source = utils.get_shader_source(Shell, SHADER_FILENAME, import.meta.url); - if (this._source) - this.set_shader_source(this._source); + utils.setup_params(this, params); } static get default_params() { @@ -61,10 +70,23 @@ export const UpscaleEffect = utils.IS_IN_PREFERENCES ? } set factor(value) { - if (this._factor !== value) { - this._factor = value; + const v = Math.max(1, value || 1); + if (this._factor !== v) { + this._factor = v; + + uniforms.set_uniform(this, 'factor', this._factor); + } + } + + get opacity_factor() { + return this._opacity_factor; + } + + set opacity_factor(value) { + if (this._opacity_factor !== value) { + this._opacity_factor = value; - this.set_uniform_value('factor', this._factor); + uniforms.set_uniform(this, 'opacity_factor', parseFloat(this._opacity_factor)); } } @@ -73,10 +95,11 @@ export const UpscaleEffect = utils.IS_IN_PREFERENCES ? } set width(value) { - if (this._width !== value) { - this._width = value; + const v = Math.max(1, value || 1); + if (this._width !== v) { + this._width = v; - this.set_uniform_value('width', parseFloat(this._width - 1e-6)); + uniforms.set_uniform(this, 'width', parseFloat(this._width - 1e-6)); } } @@ -85,10 +108,11 @@ export const UpscaleEffect = utils.IS_IN_PREFERENCES ? } set height(value) { - if (this._height !== value) { - this._height = value; + const v = Math.max(1, value || 1); + if (this._height !== v) { + this._height = v; - this.set_uniform_value('height', parseFloat(this._height - 1e-6)); + uniforms.set_uniform(this, 'height', parseFloat(this._height - 1e-6)); } } @@ -112,9 +136,17 @@ export const UpscaleEffect = utils.IS_IN_PREFERENCES ? } vfunc_paint_target(paint_node, paint_context) { - // force setting nearest-neighbour texture filtering - this.get_pipeline().set_layer_filters(0, 9728, 9728); + uniforms.upload_uniforms(this); + + const pipeline = this.get_pipeline(); + if (pipeline) { + pipeline.set_layer_filters(0, 9728, 9728); + } super.vfunc_paint_target(paint_node, paint_context); } - }); \ No newline at end of file +}; + +export const UpscaleEffect = utils.IS_IN_PREFERENCES + ? { default_params: DEFAULT_PARAMS } + : utils.register_shader_effect(UPSCALE_EFFECT_META, UpscaleEffectClass, SHADER_SOURCE); -- cgit v1.3