[cinnamon] patch systray applet

leigh123linux leigh123linux at fedoraproject.org
Fri Jul 27 18:15:24 UTC 2012


commit a1d683fd39ece5a4fa7761c619ba862b4a37e546
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Jul 27 19:15:21 2012 +0100

    patch systray applet

 cinnamon.spec |    8 ++++++--
 systray.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 046c906..90603aa 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -8,7 +8,7 @@
 
 Name:           cinnamon
 Version:        1.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -31,6 +31,7 @@ Patch1:         cinnamon-1.5.0_datetime_setting.patch
 Patch2:         cinnamon-1.4.1_f17_favourite-apps-firefox.patch
 
 # upstream patches and pending pulls
+Patch11:        systray.patch
 
 
 %global clutter_version 1.7.5
@@ -116,7 +117,7 @@ The emphasis is put on making users feel at home and providing
 %patch2 -p1
 
 # upstream patches and pending pulls
-
+%patch11 -p1
 
 
 # remove gschema
@@ -224,6 +225,9 @@ fi
 
 
 %changelog
+* Fri Jul 27 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.2-2
+- patch systray applet
+
 * Thu Jul 26 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.2-1
 - update to 1.5.2 release
 
diff --git a/systray.patch b/systray.patch
new file mode 100644
index 0000000..158776f
--- /dev/null
+++ b/systray.patch
@@ -0,0 +1,30 @@
+--- a/js/ui/layout.js
++++ b/js/ui/layout.js
+@@ -1138,7 +1138,15 @@ Chrome.prototype = {
+             struts.push(strut);
+         }
+ 
+-        if (global.top_window_group.get_children().length == 0)
++        let enable_stage = true;
++        let top_windows = global.top_window_group.get_children();
++        for (var i in top_windows){
++            if (top_windows[i]._windowType != Meta.WindowType.TOOLTIP){
++                enable_stage = false;
++                break;
++            }
++        }
++        if (enable_stage)
+             global.set_stage_input_region(rects);
+         else
+             global.set_stage_input_region([]);
+--- a/files/usr/share/cinnamon/applets/systray at cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/systray at cinnamon.org/applet.js
+@@ -61,7 +61,7 @@ MyApplet.prototype = {
+                 height = themeNode.get_length('height');                        
+             }
+             
+-            if (buggyIcons.indexOf(role) != -1) {
++            if (icon.get_width() == 1 || icon.get_height() == 1 || buggyIcons.indexOf(role) != -1) {
+                 icon.set_height(height);
+             }
+             else {


More information about the scm-commits mailing list