Merge lp:~marcobiscaro2112/unity/fixes-767733 into lp:unity

[Marco Biscaro]

[Gord Allott (gordallott)]

works well, approved

review: Approve

=== modified file 'src/PanelHomeButton.cpp'
--- src/PanelHomeButton.cpp	2011-04-18 13:21:26 +0000
+++ src/PanelHomeButton.cpp	2011-04-26 15:50:52 +0000
@@ -40,6 +40,7 @@
 
 PanelHomeButton::PanelHomeButton ()
 : TextureArea (NUX_TRACKER_LOCATION),
+  _opacity (1.0f),
   _urgent_interest (0)
 {
   _urgent_count = 0;
@@ -141,7 +142,7 @@
 
   /* button pressed effect */
   if (_pressed) {
-    if (PanelStyle::GetDefault ()->IsAmbianceOrRadiance ()) {
+    if (PanelStyle::GetDefault ()->IsAmbianceOrRadiance () && _opacity == 1.0f) {
       /* loads background panel upside-down */
       overlay = gdk_pixbuf_flip (PanelStyle::GetDefault ()->GetBackground (width - 2, height), FALSE);
       if (GDK_IS_PIXBUF (overlay)) {
@@ -377,3 +378,8 @@
 PanelHomeButton::ProcessDndDrop (int x, int y)
 {
 }
+
+void
+PanelHomeButton::SetOpacity (float opacity) {
+  _opacity = opacity;
+}
 
=== modified file 'src/PanelHomeButton.h'
--- src/PanelHomeButton.h	2011-04-16 14:31:46 +0000
+++ src/PanelHomeButton.h	2011-04-26 15:50:52 +0000
@@ -44,6 +44,7 @@
   void RecvMouseMove(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
 
   void SetButtonWidth (int button_width);
+  void SetOpacity (float opacity);
 
 protected:
   const gchar* GetName ();
@@ -66,6 +67,7 @@
   int _button_width;
   int _urgent_count;
   bool _pressed;
+  float _opacity;
   
   gulong _theme_changed_id;
   guint _urgent_interest;
 
=== modified file 'src/PanelView.cpp'
--- src/PanelView.cpp	2011-04-19 14:30:27 +0000
+++ src/PanelView.cpp	2011-04-26 15:50:52 +0000
@@ -423,6 +423,8 @@
     return;
 
   _opacity = opacity;
+
+  _home_button->SetOpacity (opacity);
   
   ForceUpdateBackground ();
 }