From 9d5be1660d8f74038ebed3d74fdbc809e43787ae Mon Sep 17 00:00:00 2001 From: Nippy Date: Fri, 9 Oct 2026 17:23:53 +0200 Subject: gnome fix --- .../preferences/applications.js | 5 + .../blur-my-shell@aunetx/preferences/other.js | 4 +- .../blur-my-shell@aunetx/preferences/panel.js | 36 ++++++ .../pipelines_management/pipeline_choose_row.js | 7 +- .../blur-my-shell@aunetx/preferences/popup.js | 121 +++++++++++++++++++++ 5 files changed, 169 insertions(+), 4 deletions(-) create mode 100644 raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/popup.js (limited to 'raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences') diff --git a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/applications.js b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/applications.js index 49d2245..0884f36 100644 --- a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/applications.js +++ b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/applications.js @@ -45,6 +45,7 @@ export const Applications = GObject.registerClass({ 'opacity', 'dynamic_opacity', 'blur_on_overview', + 'unblur_when_fullscreen', 'enable_all', 'whitelist', 'add_window_whitelist', @@ -90,6 +91,10 @@ export const Applications = GObject.registerClass({ 'blur-on-overview', this._blur_on_overview, 'active', Gio.SettingsBindFlags.DEFAULT ); + this.preferences.applications.settings.bind( + 'unblur-when-fullscreen', this._unblur_when_fullscreen, 'active', + Gio.SettingsBindFlags.DEFAULT + ); this.preferences.applications.settings.bind( 'enable-all', this._enable_all, 'active', Gio.SettingsBindFlags.DEFAULT diff --git a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/other.js b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/other.js index 0fac364..9115d61 100644 --- a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/other.js +++ b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/other.js @@ -25,7 +25,7 @@ export const Other = GObject.registerClass({ 'debug', 'reset' ], -}, class Overview extends Adw.PreferencesPage { +}, class Other extends Adw.PreferencesPage { constructor(preferences, pipelines_manager, pipelines_page) { super({}); @@ -83,4 +83,4 @@ export const Other = GObject.registerClass({ this._reset.connect('clicked', () => this.preferences.reset()); } -}); \ No newline at end of file +}); diff --git a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/panel.js b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/panel.js index 1115710..66b3b09 100644 --- a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/panel.js +++ b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/panel.js @@ -24,6 +24,12 @@ export const Panel = GObject.registerClass({ 'override_background', 'style_panel', 'override_background_dynamically', + 'override_background_dynamically_mode_row', + 'override_background_dynamically_mode', + 'gradient_panel_row', + 'gradient_panel', + 'gradient_panel_mode_row', + 'gradient_panel_mode', 'hidetopbar_compatibility', 'dtp_blur_original_panel' ], @@ -87,6 +93,28 @@ export const Panel = GObject.registerClass({ this._override_background_dynamically, 'active', Gio.SettingsBindFlags.DEFAULT ); + this.preferences.panel.settings.bind( + 'override-background-dynamically-mode', + this._override_background_dynamically_mode, 'selected', + Gio.SettingsBindFlags.DEFAULT + ); + this.preferences.panel.settings.bind( + 'gradient-panel', this._gradient_panel, 'active', + Gio.SettingsBindFlags.DEFAULT + ); + this.preferences.panel.settings.bind( + 'gradient-panel-mode', this._gradient_panel_mode, 'selected', + Gio.SettingsBindFlags.DEFAULT + ); + this.preferences.panel.OVERRIDE_BACKGROUND_DYNAMICALLY_changed( + () => this.proximity_option_changed() + ); + this.preferences.panel.OVERRIDE_BACKGROUND_DYNAMICALLY_MODE_changed( + () => this.proximity_option_changed() + ); + this.preferences.panel.GRADIENT_PANEL_changed( + () => this.proximity_option_changed() + ); this.preferences.hidetopbar.settings.bind( 'compatibility', this._hidetopbar_compatibility, 'active', Gio.SettingsBindFlags.DEFAULT @@ -97,6 +125,12 @@ export const Panel = GObject.registerClass({ ); } + proximity_option_changed() { + this._override_background_dynamically_mode_row.set_visible(this.preferences.panel.OVERRIDE_BACKGROUND_DYNAMICALLY); + this._gradient_panel_row.set_visible(this.preferences.panel.OVERRIDE_BACKGROUND_DYNAMICALLY && this.preferences.panel.OVERRIDE_BACKGROUND_DYNAMICALLY_MODE == 0); + this._gradient_panel_mode_row.set_visible(this.preferences.panel.OVERRIDE_BACKGROUND_DYNAMICALLY && this.preferences.panel.GRADIENT_PANEL && this.preferences.panel.OVERRIDE_BACKGROUND_DYNAMICALLY_MODE == 0); + } + change_blur_mode(is_static_blur, first_run) { this._mode_static.set_active(is_static_blur); if (first_run) @@ -107,5 +141,7 @@ export const Panel = GObject.registerClass({ this._brightness_row.set_visible(!is_static_blur); this._corner_radius_row.set_visible(!is_static_blur && this.preferences.ROUNDED_BLUR_FOUND); this._corner_radius_not_found_row.set_visible(!is_static_blur && !this.preferences.ROUNDED_BLUR_FOUND); + + this.proximity_option_changed(); } }); diff --git a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/pipelines_management/pipeline_choose_row.js b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/pipelines_management/pipeline_choose_row.js index e0c5165..d043bad 100644 --- a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/pipelines_management/pipeline_choose_row.js +++ b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/pipelines_management/pipeline_choose_row.js @@ -73,7 +73,10 @@ export const PipelineChooseRow = GObject.registerClass({ const pipeline_id = this._pipeline_model.get_string(i); // if we have more pipelines than we should have: rebuild... // that is the case when resetting the preferences for example - if (!(pipeline_id in this.pipelines_manager)) { + if ( + pipeline_id !== 'create_new' + && !(pipeline_id in this.pipelines_manager.pipelines) + ) { this.create_pipelines_list(); return; } @@ -103,4 +106,4 @@ export const PipelineChooseRow = GObject.registerClass({ this._is_creating_pipelines_list = false; this.on_selected_pipeline_changed(); } -}); \ No newline at end of file +}); diff --git a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/popup.js b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/popup.js new file mode 100644 index 0000000..5d60d8a --- /dev/null +++ b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/popup.js @@ -0,0 +1,121 @@ +import Adw from 'gi://Adw'; +import GLib from 'gi://GLib'; +import GObject from 'gi://GObject'; +import Gio from 'gi://Gio'; + + +export const PopupBlur = GObject.registerClass({ + GTypeName: 'PopupBlur', + Template: GLib.uri_resolve_relative(import.meta.url, '../ui/popup.ui', GLib.UriFlags.NONE), + InternalChildren: [ + 'blur', + 'pipeline_choose_row', + 'mode_static', + 'mode_dynamic', + 'sigma_row', + 'sigma', + 'brightness_row', + 'brightness', + 'corner_radius_row', + 'corner_radius', + 'menu_corner_radius', + 'quick_settings_corner_radius', + 'notification_corner_radius', + 'osd_corner_radius', + 'dialog_corner_radius', + 'osk_corner_radius', + 'corner_radius_not_found_row', + 'override_background', + 'preserve_shell_theme', + 'style_popup' + ], +}, class PopupBlur extends Adw.PreferencesPage { + constructor(preferences, pipelines_manager, pipelines_page) { + super({}); + + this.preferences = preferences; + this.pipelines_manager = pipelines_manager; + this.pipelines_page = pipelines_page; + + this.preferences.popup.settings.bind( + 'blur', this._blur, 'active', + Gio.SettingsBindFlags.DEFAULT + ); + + this._pipeline_choose_row.initialize( + this.preferences.popup, this.pipelines_manager, this.pipelines_page + ); + + this.change_blur_mode(this.preferences.popup.STATIC_BLUR, true); + + this._mode_static.connect('toggled', + () => this.preferences.popup.STATIC_BLUR = this._mode_static.active + ); + this.preferences.popup.STATIC_BLUR_changed( + () => this.change_blur_mode(this.preferences.popup.STATIC_BLUR, false) + ); + + this.preferences.popup.settings.bind( + 'sigma', this._sigma, 'value', + Gio.SettingsBindFlags.DEFAULT + ); + this.preferences.popup.settings.bind( + 'brightness', this._brightness, 'value', + Gio.SettingsBindFlags.DEFAULT + ); + this.preferences.popup.settings.bind( + 'corner-radius', this._corner_radius, 'value', + Gio.SettingsBindFlags.DEFAULT + ); + this.preferences.popup.settings.bind( + 'menu-corner-radius', this._menu_corner_radius, 'value', + Gio.SettingsBindFlags.DEFAULT + ); + this.preferences.popup.settings.bind( + 'quick-settings-corner-radius', this._quick_settings_corner_radius, 'value', + Gio.SettingsBindFlags.DEFAULT + ); + this.preferences.popup.settings.bind( + 'notification-corner-radius', this._notification_corner_radius, 'value', + Gio.SettingsBindFlags.DEFAULT + ); + this.preferences.popup.settings.bind( + 'osd-corner-radius', this._osd_corner_radius, 'value', + Gio.SettingsBindFlags.DEFAULT + ); + this.preferences.popup.settings.bind( + 'dialog-corner-radius', this._dialog_corner_radius, 'value', + Gio.SettingsBindFlags.DEFAULT + ); + this.preferences.popup.settings.bind( + 'osk-corner-radius', this._osk_corner_radius, 'value', + Gio.SettingsBindFlags.DEFAULT + ); + this.preferences.popup.settings.bind( + 'override-background', + this._override_background, 'enable-expansion', + Gio.SettingsBindFlags.DEFAULT + ); + this.preferences.popup.settings.bind( + 'preserve-shell-theme', + this._preserve_shell_theme, 'active', + Gio.SettingsBindFlags.DEFAULT + ); + this.preferences.popup.settings.bind( + 'style-popup', this._style_popup, 'selected', + Gio.SettingsBindFlags.DEFAULT + ); + } + + change_blur_mode(is_static_blur, first_run) { + this._mode_static.set_active(is_static_blur); + if (first_run) + this._mode_dynamic.set_active(!is_static_blur); + + this._pipeline_choose_row.set_visible(is_static_blur); + this._sigma_row.set_visible(!is_static_blur); + this._brightness_row.set_visible(!is_static_blur); + this._corner_radius_row.set_visible(is_static_blur || this.preferences.ROUNDED_BLUR_FOUND); + this._corner_radius_not_found_row.set_visible(!is_static_blur && !this.preferences.ROUNDED_BLUR_FOUND); + } +}); -- cgit v1.3