Only animate menus when fading out, so they don't feel slow

(bzr r451.1.5)

2 files changed, 5 insertions, 5 deletions

diff --git a/unity-private/panel/panel-indicator-bar.vala b/unity-private/panel/panel-indicator-bar.vala
index a6797feba..fe69bbfe2 100644
--- a/unity-private/panel/panel-indicator-bar.vala
+++ b/unity-private/panel/panel-indicator-bar.vala
@@ -44,7 +44,7 @@ namespace Unity.Panel.Indicators
 {
 var name = model.get_indicator_name (o);
 
- if (name != "libappmenu.so" || true == true)
+ if (name != "libappmenu.so")
 {
 IndicatorObjectView indicator_object_view = new IndicatorObjectView (o);
 indicator_object_view.menu_moved.connect (this.on_menu_moved);
diff --git a/unity-private/panel/panel-indicator-object-entry-view.vala b/unity-private/panel/panel-indicator-object-entry-view.vala
index 83f82dd24..89525eb3f 100644
--- a/unity-private/panel/panel-indicator-object-entry-view.vala
+++ b/unity-private/panel/panel-indicator-object-entry-view.vala
@@ -270,7 +270,7 @@ namespace Unity.Panel.Indicators
 */
 entry.menu.move_current.connect (menu_key_moved);
 entry.menu.notify["visible"].connect (menu_vis_changed);
- bg.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 200, "opacity", 255);
+ bg.opacity = 255;
 }
 }
 
@@ -280,7 +280,7 @@ namespace Unity.Panel.Indicators
 if (vis == false)
 {
 /* The menu isn't visible anymore. Disconnect some signals. */
- bg.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 200, "opacity", 0);
+ bg.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 100, "opacity", 0);
 entry.menu.move_current.disconnect (menu_key_moved);
 entry.menu.notify["visible"].disconnect (menu_vis_changed);
 menu_is_open = false;
@@ -396,8 +396,8 @@ namespace Unity.Panel.Indicators
 cr.line_to (1, height);
 
 var pat = new Cairo.Pattern.linear (1, 0, 1, height);
- pat.add_color_stop_rgba (0.0, 0.8509f, 0.8196f, 0.7294f, 1.0f);
- pat.add_color_stop_rgba (1.0, 0.7019f, 0.6509f, 0.5137f, 1.0f);
+ pat.add_color_stop_rgba (0.0, 248/255.0f, 134/255.0f, 87/255.0f, 1.0f);
+ pat.add_color_stop_rgba (1.0, 236/255.0f, 113/255.0f, 63/255.0f, 1.0f);
 cr.set_source (pat);
 cr.fill ();