Merge lp:~unity-team/unity/unity.fix-604505 into lp:unity

[Mirco Müller]

This branch fixes LP: #604505.

It makes insensitive labels/images render with less opacity and makes sure they can't be accessed by mouse-clicks or keyboard-navigation.

The only test-case used to verify is the Room-menu of empathy, like mentioned in the bug. There's a glitch of the insensitive menu being reactive (for mouse-clicks) when empathy starts up, although it's rendered being inactive. That's due to the constructor setting it to true. Not sure how to work around it without breaking something.

[Jay Taoko (jaytaoko)]

Approved

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-08-26 17:04:48 +0000
+++ .bzrignore	2010-09-15 13:41:49 +0000
@@ -355,3 +355,4 @@
 unity/unity-layered-bin.c
 unity-private/places/places-default-renderer-tiles.c
 unity-private/places/places-button.c
+unity-private/panel/panel-divider.c

=== modified file 'unity-private/panel/panel-indicator-object-entry-view.vala'
--- unity-private/panel/panel-indicator-object-entry-view.vala	2010-08-21 13:27:15 +0000
+++ unity-private/panel/panel-indicator-object-entry-view.vala	2010-09-15 13:41:49 +0000
@@ -34,6 +34,8 @@
     private float last_width = 0;
     private float last_height = 0;
 
+    public bool skip;
+
     public IndicatorObjectEntryView (Indicator.ObjectEntry _entry)
     {
       Object (entry:_entry,
@@ -66,6 +68,8 @@
       bg.opacity = 0;
       bg.show ();
 
+      skip = false;
+
       if (entry.image is Gtk.Image)
         {
           image = new Ctk.Image (22);
@@ -97,6 +101,41 @@
               image.hide ();
             }
 
+          if ((entry.image.get_flags () & Gtk.WidgetFlags.SENSITIVE) != 0)
+            {
+              this.reactive = true;
+              this.skip = false;
+              image.opacity = 255;
+            }
+          else
+            {
+              this.reactive = false;
+              this.skip = true;
+              image.opacity = 64;
+            }
+
+          entry.image.notify["sensitive"].connect (() =>
+            {
+              if ((entry.image.get_flags () & Gtk.WidgetFlags.SENSITIVE) != 0)
+                {
+                  this.reactive = true;
+                  this.skip = false;
+                  image.animate (Clutter.AnimationMode.EASE_OUT_QUAD,
+                                 200,
+                                 "opacity",
+                                 255);
+                }
+              else
+                {
+                  this.reactive = false;
+                  this.skip = true;
+                  image.animate (Clutter.AnimationMode.EASE_OUT_QUAD,
+                                 200,
+                                 "opacity",
+                                 64);
+                }
+            });
+
           entry.image.notify["visible"].connect (() =>
             {
               if (entry.image != null)
@@ -170,6 +209,41 @@
               text.hide ();
             }
 
+          if ((entry.label.get_flags () & Gtk.WidgetFlags.SENSITIVE) != 0)
+            {
+              this.reactive = true;
+              this.skip = false;
+              text.opacity = 255;
+            }
+          else
+            {
+              this.reactive = false;
+              this.skip = true;
+              text.opacity = 64;
+            }
+
+          entry.label.notify["sensitive"].connect (() =>
+            {
+              if ((entry.label.get_flags () & Gtk.WidgetFlags.SENSITIVE) != 0)
+                {
+                  this.reactive = true;
+                  this.skip = false;
+                  text.animate (Clutter.AnimationMode.EASE_OUT_QUAD,
+                                200,
+                                "opacity",
+                                255);
+                }
+              else
+                {
+                  this.reactive = false;
+                  this.skip = true;
+                  text.animate (Clutter.AnimationMode.EASE_OUT_QUAD,
+                                200,
+                                "opacity",
+                                64);
+                }
+            });
+
           entry.label.notify["visible"].connect (() =>
             {
               if (entry.label != null)

=== modified file 'unity-private/panel/panel-indicator-object-view.vala'
--- unity-private/panel/panel-indicator-object-view.vala	2010-08-21 12:48:10 +0000
+++ unity-private/panel/panel-indicator-object-view.vala	2010-09-15 13:41:49 +0000
@@ -114,6 +114,25 @@
         }
 
       IndicatorObjectEntryView next_object_entry_view = this.indicator_entry_array.get (pos);
+      if (next_object_entry_view.skip)
+        {
+          if (type == Gtk.MenuDirectionType.PARENT)
+            {
+              if (pos == 0)
+                next_object_entry_view = this.indicator_entry_array.get (this.indicator_entry_array.size - 1);
+              else
+                next_object_entry_view = this.indicator_entry_array.get (pos-1);
+
+            }
+          else if (type == Gtk.MenuDirectionType.CHILD)
+            {
+              if (pos == this.indicator_entry_array.size - 1)
+                next_object_entry_view = this.indicator_entry_array.get (0);
+              else
+                next_object_entry_view = this.indicator_entry_array.get (pos+1);
+            }
+        }
+
       next_object_entry_view.show_menu ();
       /* Signal to be picked up by IndicatorBar */
       //this.menu_moved (type);