Raveos gnome update

4 files changed, 47 insertions, 6 deletions

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 a4dd5be..49d2245 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
@@ -37,6 +37,11 @@ export const Applications = GObject.registerClass({
         'sigma',
         'brightness_row',
         'brightness',
+        'corner_radius_not_found_row',
+        'corner_radius_row',
+        'corner_radius',
+        'corner_when_maximized_row',
+        'corner_when_maximized',
         'opacity',
         'dynamic_opacity',
         'blur_on_overview',
@@ -97,6 +102,14 @@ export const Applications = GObject.registerClass({
             'brightness', this._brightness, 'value',
             Gio.SettingsBindFlags.DEFAULT
         );
+        this.preferences.applications.settings.bind(
+            'corner-radius', this._corner_radius, 'value',
+            Gio.SettingsBindFlags.DEFAULT
+        );
+        this.preferences.applications.settings.bind(
+            'corner-when-maximized', this._corner_when_maximized, 'active',
+            Gio.SettingsBindFlags.DEFAULT
+        );
 
         // connect 'enable all' button to whitelist/blacklist visibility
         this._enable_all.bind_property(
@@ -213,5 +226,9 @@ export const Applications = GObject.registerClass({
         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._corner_radius_row.set_visible(!is_static_blur && this.preferences.ROUNDED_BLUR_FOUND);
+        //this._corner_when_maximized_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);
     }
-});
\ No newline at end of file
+});
diff --git a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/dash.js b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/dash.js
index aae3768..147c135 100644
--- a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/dash.js
+++ b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/dash.js
@@ -16,6 +16,9 @@ export const Dash = GObject.registerClass({
         'sigma',
         'brightness_row',
         'brightness',
+        'corner_radius_not_found_row',
+        'corner_radius_row',
+        'corner_radius',
         'override_background',
         'style_dash_to_dock',
         'unblur_in_overview'
@@ -55,6 +58,10 @@ export const Dash = GObject.registerClass({
             Gio.SettingsBindFlags.DEFAULT
         );
         this.preferences.dash_to_dock.settings.bind(
+            'corner-radius', this._corner_radius, 'value',
+            Gio.SettingsBindFlags.DEFAULT
+        );
+        this.preferences.dash_to_dock.settings.bind(
             'override-background',
             this._override_background, 'enable-expansion',
             Gio.SettingsBindFlags.DEFAULT
@@ -77,5 +84,7 @@ export const Dash = GObject.registerClass({
         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);
     }
-});
\ 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 c49f323..1115710 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
@@ -16,6 +16,9 @@ export const Panel = GObject.registerClass({
         'sigma',
         'brightness_row',
         'brightness',
+        'corner_radius_not_found_row',
+        'corner_radius_row',
+        'corner_radius',
         'unblur_in_overview',
         'force_light_text',
         'override_background',
@@ -59,6 +62,10 @@ export const Panel = GObject.registerClass({
             Gio.SettingsBindFlags.DEFAULT
         );
         this.preferences.panel.settings.bind(
+            'corner-radius', this._corner_radius, 'value',
+            Gio.SettingsBindFlags.DEFAULT
+        );
+        this.preferences.panel.settings.bind(
             'unblur-in-overview', this._unblur_in_overview, 'active',
             Gio.SettingsBindFlags.DEFAULT
         );
@@ -98,5 +105,7 @@ export const Panel = GObject.registerClass({
         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);
     }
-});
\ No newline at end of file
+});
diff --git a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/pipelines_management/effect_row.js b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/pipelines_management/effect_row.js
index 130edfd..3a95d49 100644
--- a/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/pipelines_management/effect_row.js
+++ b/raveos-gnome-theme/theme-data/extensions/installed/blur-my-shell@aunetx/preferences/pipelines_management/effect_row.js
@@ -154,18 +154,24 @@ export const EffectRow = GObject.registerClass({
                         width_request: 75,
                         height_request: 45,
                         show_editor: true,
-                        use_alpha: true
+                        use_alpha: param.use_alpha
                     });
                     row.add_suffix(color_button);
                     // set original color
                     let c = color_button.get_rgba().copy();
-                    [c.red, c.green, c.blue, c.alpha] = this.get_effect_param(param_key);
+                    if (param.use_alpha)
+                        [c.red, c.green, c.blue, c.alpha] = this.get_effect_param(param_key);
+                    else
+                        [c.red, c.green, c.blue] = this.get_effect_param(param_key);
                     color_button.set_rgba(c);
                     // update on on 'color-set'
                     color_button.connect(
                         'color-set', () => {
                             let c = color_button.get_rgba();
-                            this.set_effect_param(param_key, [c.red, c.green, c.blue, c.alpha]);
+                            if (param.use_alpha)
+                                this.set_effect_param(param_key, [c.red, c.green, c.blue, c.alpha]);
+                            else
+                                this.set_effect_param(param_key, [c.red, c.green, c.blue]);
                         }
                     );
                     break;