[BlurCinnamon@klangman] V1.4.1 minor fixes and improvements (#864)

* Fix for the main menu's favourite box fading from a solid color into it's blurred state on open (Mint-Y theme)
* Take into account the popup-menu box margins when applying blurring so that blurring can be properly sized for the popup-menu (Orchis-Dark theme)
* Fix a typo in the setting window
* Properly free popup-menu blur elements
* Improve the transition of panels when disabling/enabling (i.e entering/exiting Overview) so that the panel does change in brightness suddenly
* Prevent errors under wayland (but the blur effects are still not working under wayland)
* Closes #856

Author: klangman

BlurCinnamon@klangman/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.4.1
+
+* Fix for the main menu's favourite box fading from a solid color into it's blurred state on open (Mint-Y theme)
+* Take into account the popup-menu box margins when applying blurring so that blurring can be properly sized for the popup-menu (Orchis-Dark theme)
+* Fix a typo in the setting window
+* Properly free popup-menu blur elements
+* Improve the transition of panels when disabling/enabling (i.e entering/exiting Overview) so that the panel does change in brightness suddenly
+* Prevent errors under wayland (but the blur effects are still not working under wayland)
+
 ## 1.4.0
 
 * Added the ability to apply effects to the Desktop background image (you can Dim, Blur and Desaturate, but currently you can't colorize the background image)

BlurCinnamon@klangman/README.md

@@ -35,8 +35,8 @@ Using any of the above with Blur Cinnamon may have some odd side effects that wo
 
 ## Limitations
 
-1. The Applet popup menu effects are intended to be used with the Cinnamon (6.4) theme or the Mint-Y dark desktop themes. The effects might work will with some other themes but I have not tested them so the effects might not work out just right. You can try the Mint-Y light themes but it might be hard to read the menu items without some playing around with the settings and the background image. To make sure that the blurred background does not spill over any rounded corners, the Main Menu rounded corners will be disabled when Main Menu effects are enabled. Menu Menu effects are disabled by default.
-2. The Applet popup menu effects works for all the applets that I have tested except "Cinnamenu", which uses a bit of an odd way to activate the popup menu, making it more difficult to intercept the menu open process so that I can change the menu's transparency setting.
+1. The Applet popup menu effects are intended to be used with the Cinnamon (6.4) theme or the Mint-Y dark desktop themes. The effects might work will with some other themes but I have not tested them so the effects might not work out just right. You can try the Mint-Y light themes but it might be hard to read the menu items without some playing around with the settings and the background image. To make sure that the blurred background does not spill over any rounded corners, the popup-menu rounded corners will be disabled when popup-menu effects are enabled. Popup-menu effects are disabled by default in this extension.
+2. The Applet popup-menu effects works for all the applets that I have tested except "Cinnamenu", which uses a bit of an odd way to activate the popup menu, making it more difficult to intercept the menu open process so that I can change the menu's transparency setting.
 3. Currently, any windows that are moved such that they overlap with a panel or the Applet popup menus will not be visible beneath the panel/menus as you might expect with a transparent panel/menu. This is because the blur effect is applied to a user interface element that floats above all windows just like the panel floats above the windows. At some point I hope to look into allowing the blur element to appear below all windows rather than above and make the a optional behavior setting.
 4. If you disable effects for any Cinnamon component under the General tab of the setting dialog while any "Use unique effect settings" options are enabled under the other tabs, the components "effect setting" options under the other tabs will still be visible, but changing those setting will have no effect until you re-enable the component under the General tab. Ideally those effect setting would only be visible when the component is enabled under the general tab but Cinnamon setting support is a bit limited in this way.
 

BlurCinnamon@klangman/files/BlurCinnamon@klangman/6.0/extension.js

@@ -306,7 +306,12 @@ class BlurPanels {
       // windows beneath the panels from being visible.
       //if (blurType > BlurType.None || saturation<100) {
          let fx;
-         let background = Meta.X11BackgroundActor.new_for_display(global.display);
+         let background;
+         if (!Meta.is_wayland_compositor()) {
+            background = Meta.X11BackgroundActor.new_for_display(global.display);
+         } else {
+            background = new Clutter.Actor();
+         }
          global.overlay_group.add_actor(background);
          blurredPanel.background = background;
          background.set_clip( panel.actor.x, panel.actor.y, panel.actor.width, panel.actor.height );
@@ -521,9 +526,8 @@ class BlurPanels {
    blurEnable(...params) {
       try {
          if (this.__blurredPanel && this.__blurredPanel.background && !global.display.get_monitor_in_fullscreen(this.monitorIndex) && !this._hidden) {
-            this.__blurredPanel.background.show();
-            this.__blurredPanel.background.ease(
-               {opacity: 255, duration: AUTOHIDE_ANIMATION_TIME * 1000, mode: Clutter.AnimationMode.EASE_OUT_QUAD } );
+            // Only show the blurred background after the panel animation is almost done
+            Mainloop.timeout_add((AUTOHIDE_ANIMATION_TIME * 1000)*.9, () => this.__blurredPanel.background.show() );
          }
       } catch (e) {}
       blurPanelsThis._originalPanelEnable.apply(this, params);
@@ -532,9 +536,8 @@ class BlurPanels {
    blurDisable(...params) {
       try {
          if (this.__blurredPanel && this. __blurredPanel.background && !this._hidden) {
-            this.__blurredPanel.background.ease(
-               {opacity: 0, duration: AUTOHIDE_ANIMATION_TIME * 1000, mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                  onComplete: () => { this.__blurredPanel.background.hide(); } });
+            // Delay 50ms before hiding the blurred background to avoid a sudden unblurring of the panel before other animations even get started
+            Mainloop.timeout_add(50, () => this.__blurredPanel.background.hide() );
          }
       } catch (e) {}
       blurPanelsThis._originalPanelDisable.apply(this, params);
@@ -551,7 +554,11 @@ class BlurPopupMenus {
 
       this._blurEffect = new GaussianBlur.GaussianBlurEffect( {radius: 0, brightness: 1 , width: 0, height: 0} );
       this._desatEffect = new Clutter.DesaturateEffect({factor: 1});
-      this._background = Meta.X11BackgroundActor.new_for_display(global.display);
+      if (!Meta.is_wayland_compositor()) {
+         this._background = Meta.X11BackgroundActor.new_for_display(global.display);
+      } else {
+         this._background = new Clutter.Actor();
+      }
       this._background.add_effect_with_name( BLUR_EFFECT_NAME, this._blurEffect );
       this._background.add_effect_with_name( DESAT_EFFECT_NAME, this._desatEffect );
       global.overlay_group.add_actor(this._background);
@@ -576,7 +583,8 @@ class BlurPopupMenus {
       if (menu && this._currentMenu && menu === this._currentMenu) {
          let actor = menu.actor;
          if (actor.visible) {
-            this._background.set_clip( actor.x, actor.y, actor.width, actor.height );
+            let bm = menu.box.get_margin();
+            this._background.set_clip( actor.x+bm.left, actor.y+bm.top, actor.width-(bm.left+bm.right), actor.height-(bm.top+bm.bottom) );
          } else {
             this._background.set_clip( 0, 0, 0, 0 );
          }
@@ -650,7 +658,10 @@ class BlurPopupMenus {
          } else {
             let actor = menu.actor;
             let margin = actor.get_margin();
-            this._background.set_clip( actor.x+margin.left, actor.y+margin.top, actor.width-(margin.left+margin.right), actor.height-(margin.top+margin.bottom) );
+            let bm = menu.box.get_margin();
+            this._background.set_clip( actor.x+margin.left+bm.left, actor.y+margin.top+bm.top,
+                                       actor.width-(margin.left+margin.right)-(bm.left+bm.right),
+                                       actor.height-(margin.top+margin.bottom)-(bm.top+bm.bottom) );
          }
          this._background.show();
          // Now that the menu is open we need to know if new actors are added so we can check for accent elements
@@ -685,7 +696,7 @@ class BlurPopupMenus {
                   menu.blurCinnamonData.push( {entry: child, original_entry_color: child.get_background_color(), original_entry_style: child.get_style(),
                                 original_entry_class: child.get_style_class_name(), original_entry_pseudo_class: child.get_style_pseudo_class()} );
                }
-               child.set_style( "border-radius: 0px; " + //"border-image: none;  border-color: transparent;  box-shadow: 0 0 transparent; " +
+               child.set_style( "border-radius: 0px; transition-duration: 0;" + //"border-image: none;  border-color: transparent;  box-shadow: 0 0 transparent; " +
                                 "background-gradient-direction: vertical; background-gradient-start: transparent; " +
                                 "background-gradient-end: transparent;    background: transparent;" );
                child.set_background_color(this._accentColor);
@@ -750,6 +761,8 @@ class BlurPopupMenus {
    destroy() {
       // Restore monkey patched PopupMenu open & close functions
       PopupMenu.PopupMenu.prototype.open = this.original_popupmenu_open;
+      global.overlay_group.remove_actor(this._background);
+      this._background.destroy();
       //PopupMenu.PopupMenu.prototype.close = this.original_popupmenu_close;
    }
 }

BlurCinnamon@klangman/files/BlurCinnamon@klangman/6.0/settings-schema.json

@@ -394,7 +394,7 @@
 
     "panels-blendColor": {
         "type": "colorchooser",
-        "description" : "Dimming ovrerlay color",
+        "description" : "Dimming overlay color",
         "default": "rgb(0,0,0)",
         "dependency" : "!enable-panel-unique-settings",
         "tooltip": "Defines the color that is blended into the background based on the dimming control above. Use black for a normal dimming effect or some other color for a color blend effect"
@@ -459,7 +459,7 @@
 
     "popup-blendColor": {
         "type": "colorchooser",
-        "description" : "Dimming ovrerlay color",
+        "description" : "Dimming overlay color",
         "default": "rgb(0,0,0)",
         "dependency" : "enable-popup-override=1",
         "tooltip": "Defines the color that is blended into the background based on the dimming control above. Use black for a normal dimming effect or some other color for a color blend effect"
@@ -527,7 +527,7 @@
 
     "desktop-blendColor": {
         "type": "colorchooser",
-        "description" : "Dimming ovrerlay color",
+        "description" : "Dimming overlay color",
         "default": "rgb(0,0,0)",
         "dependency" : "enable-desktop-override=1",
         "tooltip": "Defines the color that is blended into the background based on the dimming control above. Use black for a normal dimming effect or some other color for a color blend effect"

BlurCinnamon@klangman/files/BlurCinnamon@klangman/metadata.json

@@ -1,8 +1,8 @@
 {
     "uuid": "BlurCinnamon@klangman",
     "name": "Blur Cinnamon",
-    "version": "1.4.0",
-    "description": "Allows you to blur, colorize, desaturate and adjust the dimming of some Cinnamon Desktop components (i.e. Panels, Applet popup menus, Overview, Expo)",
+    "version": "1.4.1",
+    "description": "Allows you to blur, colorize, desaturate and adjust the dimming of some Cinnamon Desktop components (i.e. Panels, Applet popup menus, Overview, Expo, Desktop image)",
     "url": "https://github.com/klangman/BlurCinnamon",
     "cinnamon-version": [
         "6.0"

BlurCinnamon@klangman/files/BlurCinnamon@klangman/po/BlurCinnamon@klangman.pot

@@ -5,10 +5,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: BlurCinnamon@klangman 1.4.0\n"
+"Project-Id-Version: BlurCinnamon@klangman 1.4.1\n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-03-02 19:42-0500\n"
+"POT-Creation-Date: 2025-04-11 23:57-0400\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -24,7 +24,8 @@ msgstr ""
 #. metadata.json->description
 msgid ""
 "Allows you to blur, colorize, desaturate and adjust the dimming of some "
-"Cinnamon Desktop components (i.e. Panels, Applet popup menus, Overview, Expo)"
+"Cinnamon Desktop components (i.e. Panels, Applet popup menus, Overview, "
+"Expo, Desktop image)"
 msgstr ""
 
 #. 6.0->settings-schema.json->general-page->title
@@ -278,6 +279,9 @@ msgstr ""
 #. 6.0->settings-schema.json->blendColor->description
 #. 6.0->settings-schema.json->overview-blendColor->description
 #. 6.0->settings-schema.json->expo-blendColor->description
+#. 6.0->settings-schema.json->panels-blendColor->description
+#. 6.0->settings-schema.json->popup-blendColor->description
+#. 6.0->settings-schema.json->desktop-blendColor->description
 msgid "Dimming overlay color"
 msgstr ""
 
@@ -369,12 +373,6 @@ msgstr ""
 msgid "Adjusts the color saturation of the background image."
 msgstr ""
 
-#. 6.0->settings-schema.json->panels-blendColor->description
-#. 6.0->settings-schema.json->popup-blendColor->description
-#. 6.0->settings-schema.json->desktop-blendColor->description
-msgid "Dimming ovrerlay color"
-msgstr ""
-
 #. 6.0->settings-schema.json->panels-radius->description
 #. 6.0->settings-schema.json->popup-radius->description
 #. 6.0->settings-schema.json->desktop-radius->description

BlurCinnamon@klangman/files/BlurCinnamon@klangman/po/ca.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: BlurCinnamon@klangman 1.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-03-02 19:42-0500\n"
+"POT-Creation-Date: 2025-04-11 23:57-0400\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Odyssey <odysseyhyd@gmail.com>\n"
 "Language-Team: \n"
@@ -23,9 +23,11 @@ msgid "Blur Cinnamon"
 msgstr "Difumina Cinnamon"
 
 #. metadata.json->description
+#, fuzzy
 msgid ""
 "Allows you to blur, colorize, desaturate and adjust the dimming of some "
-"Cinnamon Desktop components (i.e. Panels, Applet popup menus, Overview, Expo)"
+"Cinnamon Desktop components (i.e. Panels, Applet popup menus, Overview, "
+"Expo, Desktop image)"
 msgstr ""
 "Us permet difuminar, tintar i ajustar l'atenuació d'alguns dels components "
 "de l'escriptori Cinnamon (com ara Taulers, Menús emergents de "
@@ -325,6 +327,9 @@ msgstr "Atenuació/Tint del fons (percentatge)"
 #. 6.0->settings-schema.json->blendColor->description
 #. 6.0->settings-schema.json->overview-blendColor->description
 #. 6.0->settings-schema.json->expo-blendColor->description
+#. 6.0->settings-schema.json->panels-blendColor->description
+#. 6.0->settings-schema.json->popup-blendColor->description
+#. 6.0->settings-schema.json->desktop-blendColor->description
 msgid "Dimming overlay color"
 msgstr "Color de l'atenuació superposada"
 
@@ -421,12 +426,6 @@ msgstr "Saturació del color de fons"
 msgid "Adjusts the color saturation of the background image."
 msgstr "Ajusta la saturació de color de la imatge de fons."
 
-#. 6.0->settings-schema.json->panels-blendColor->description
-#. 6.0->settings-schema.json->popup-blendColor->description
-#. 6.0->settings-schema.json->desktop-blendColor->description
-msgid "Dimming ovrerlay color"
-msgstr "Color de l'atenuació superposada"
-
 #. 6.0->settings-schema.json->panels-radius->description
 #. 6.0->settings-schema.json->popup-radius->description
 #. 6.0->settings-schema.json->desktop-radius->description

BlurCinnamon@klangman/files/BlurCinnamon@klangman/po/es.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: BlurCinnamon@klangman 1.0.0\n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-03-02 19:42-0500\n"
+"POT-Creation-Date: 2025-04-11 23:57-0400\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -22,9 +22,11 @@ msgid "Blur Cinnamon"
 msgstr "Desenfoque de Cinnamon"
 
 #. metadata.json->description
+#, fuzzy
 msgid ""
 "Allows you to blur, colorize, desaturate and adjust the dimming of some "
-"Cinnamon Desktop components (i.e. Panels, Applet popup menus, Overview, Expo)"
+"Cinnamon Desktop components (i.e. Panels, Applet popup menus, Overview, "
+"Expo, Desktop image)"
 msgstr ""
 "Permite desenfocar, colorear, desaturar y ajustar la atenuación de algunos "
 "componentes del escritorio Cinnamon (por ejemplo, paneles, menús emergentes "
@@ -331,6 +333,9 @@ msgstr "Atenuar/colorear fondo (porcentaje)"
 #. 6.0->settings-schema.json->blendColor->description
 #. 6.0->settings-schema.json->overview-blendColor->description
 #. 6.0->settings-schema.json->expo-blendColor->description
+#. 6.0->settings-schema.json->panels-blendColor->description
+#. 6.0->settings-schema.json->popup-blendColor->description
+#. 6.0->settings-schema.json->desktop-blendColor->description
 msgid "Dimming overlay color"
 msgstr "Atenuación del color de superposición"
 
@@ -428,12 +433,6 @@ msgstr "Saturación del color de fondo"
 msgid "Adjusts the color saturation of the background image."
 msgstr "Ajusta la saturación de color de la imagen de fondo."
 
-#. 6.0->settings-schema.json->panels-blendColor->description
-#. 6.0->settings-schema.json->popup-blendColor->description
-#. 6.0->settings-schema.json->desktop-blendColor->description
-msgid "Dimming ovrerlay color"
-msgstr "Atenuación del color de superposición"
-
 #. 6.0->settings-schema.json->panels-radius->description
 #. 6.0->settings-schema.json->popup-radius->description
 #. 6.0->settings-schema.json->desktop-radius->description