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

[Marco Biscaro]

This fixes bug #748676. Please, see screenshots on the bug report.

[Didier Roche-Tolomelli (didrocks)]

Hey Marco, really awesome work! :)
I just set the branch as Need information as it needs design request, UI freeze exception and such, feel free to reput the branch in another state once we will have an answer :)

Otherwise, the code looks good!

review: Needs Information

=== modified file 'src/PanelHomeButton.cpp'
--- src/PanelHomeButton.cpp	2011-04-12 14:34:08 +0000
+++ src/PanelHomeButton.cpp	2011-04-16 17:36:41 +0000
@@ -44,6 +44,7 @@
 {
   _urgent_count = 0;
   _button_width = 66;
+  _pressed = false;
   SetMinMaxSize (_button_width, PANEL_HEIGHT);
 
   OnMouseClick.connect (sigc::mem_fun (this, &PanelHomeButton::RecvMouseClick));
@@ -61,6 +62,16 @@
                                                     (UBusCallback) &PanelHomeButton::OnLauncherIconUrgentChanged,
                                                     this);
 
+  _shown_interest = ubus_server_register_interest (ubus_server_get_default (),
+                                                   UBUS_PLACE_VIEW_SHOWN,
+                                                   (UBusCallback)&PanelHomeButton::OnPlaceShown,
+                                                   this);
+
+  _hidden_interest = ubus_server_register_interest (ubus_server_get_default (),
+                                                    UBUS_PLACE_VIEW_HIDDEN,
+                                                    (UBusCallback)&PanelHomeButton::OnPlaceHidden,
+                                                    this);
+
   Refresh ();
   
   SetDndEnabled (false, true);
@@ -74,6 +85,14 @@
   if (_urgent_interest != 0)
     ubus_server_unregister_interest (ubus_server_get_default (),
                                      _urgent_interest);
+
+  if (_shown_interest != 0)
+    ubus_server_unregister_interest (ubus_server_get_default (),
+                                     _shown_interest);
+
+  if (_hidden_interest != 0)
+    ubus_server_unregister_interest (ubus_server_get_default (),
+                                     _hidden_interest);
 }
 
 void 
@@ -112,6 +131,7 @@
   int width = _button_width;
   int height = PANEL_HEIGHT;
   GdkPixbuf *pixbuf;
+  GdkPixbuf *overlay;
 
   SetMinMaxSize (_button_width, PANEL_HEIGHT);
 
@@ -119,17 +139,40 @@
   cairo_t *cr = cairo_graphics.GetContext();
   cairo_set_line_width (cr, 1);
 
+  /* button pressed effect */
+  if (_pressed) {
+    if (PanelStyle::GetDefault ()->IsAmbianceOrRadiance ()) {
+      /* loads background panel upside-down */
+      overlay = gdk_pixbuf_flip (PanelStyle::GetDefault ()->GetBackground (width - 2, height), FALSE);
+      if (GDK_IS_PIXBUF (overlay)) {
+        gdk_cairo_set_source_pixbuf (cr, overlay, 0, 0);
+        cairo_paint (cr);
+        g_object_unref (overlay);
+      }
+    } else {
+      /* draws an translucent overlay  */
+      cairo_set_source_rgba (cr, 0.0f, 0.0f, 0.0f, 0.3f);
+      cairo_rectangle (cr, 0, 0, width-1, height);
+      cairo_fill (cr);
+    }
+  }
+
   pixbuf = PanelStyle::GetDefault ()->GetHomeButton ();
   if (GDK_IS_PIXBUF (pixbuf))
   {
+    int offset = 0;
+
+    /* if the button pressed, draw the icon 1 px to the right */
+    if (_pressed) {
+      offset = 1;
+    }
     gdk_cairo_set_source_pixbuf (cr, pixbuf,
-                                 (_button_width-gdk_pixbuf_get_width (pixbuf))/2,
+                                 (_button_width-gdk_pixbuf_get_width (pixbuf))/2 + offset,
                                  (PANEL_HEIGHT-gdk_pixbuf_get_height (pixbuf))/2);
+    cairo_paint (cr);
     g_object_unref (pixbuf);
   }
 
-  cairo_paint (cr);
-
   cairo_set_source_rgba (cr, 0.0f, 0.0f, 0.0f, 0.2f);
   cairo_rectangle (cr, width-2, 2, 1, height-4);
   cairo_fill (cr);
@@ -293,6 +336,24 @@
   self->Refresh ();
 }
 
+void
+PanelHomeButton::OnPlaceShown (GVariant *data, gpointer user_data)
+{
+  PanelHomeButton *self = static_cast<PanelHomeButton *> (user_data);
+
+  self->_pressed = true;
+  self->Refresh (); 
+}
+
+void
+PanelHomeButton::OnPlaceHidden (GVariant *data, gpointer user_data)
+{
+  PanelHomeButton *self = static_cast<PanelHomeButton *> (user_data);
+
+  self->_pressed = false;
+  self->Refresh (); 
+}
+
 void 
 PanelHomeButton::ProcessDndEnter ()
 {

=== modified file 'src/PanelHomeButton.h'
--- src/PanelHomeButton.h	2011-04-07 20:32:56 +0000
+++ src/PanelHomeButton.h	2011-04-16 17:36:41 +0000
@@ -59,13 +59,18 @@
   static void OnIconThemeChanged (GtkIconTheme *icon_theme, gpointer data);
   
   static void OnLauncherIconUrgentChanged (GVariant *data, gpointer user_data);
+  static void OnPlaceShown (GVariant *data, gpointer user_data);
+  static void OnPlaceHidden (GVariant *data, gpointer user_data);
 
 private:
   int _button_width;
   int _urgent_count;
+  bool _pressed;
   
   gulong _theme_changed_id;
   guint _urgent_interest;
+  guint _shown_interest;
+  guint _hidden_interest;
 };
 
 #endif // PANEL_HOME_BUTTON_H

=== modified file 'src/PanelStyle.cpp'
--- src/PanelStyle.cpp	2011-03-29 12:23:52 +0000
+++ src/PanelStyle.cpp	2011-04-16 17:36:41 +0000
@@ -168,8 +168,7 @@
   // I wish there was a magic bullet here, but not all themes actually set the panel to be
   // the same style as the window titlebars (e.g. Clearlooks) so we can just grab the 
   // metacity window buttons as that would look horrible
-  if (g_strcmp0 (_theme_name, "Ambiance") == 0
-      || g_strcmp0 (_theme_name, "Radiance") == 0)
+  if (IsAmbianceOrRadiance ())
   {
     char      *filename;
     GdkPixbuf *pixbuf;
@@ -198,6 +197,11 @@
   return texture;
 }
 
+bool
+PanelStyle::IsAmbianceOrRadiance() {
+  return g_strcmp0 (_theme_name, "Ambiance") == 0 || g_strcmp0 (_theme_name, "Radiance") == 0;
+}
+
 nux::BaseTexture *
 PanelStyle::GetWindowButtonForTheme (WindowButtonType type, WindowState state)
 {

=== modified file 'src/PanelStyle.h'
--- src/PanelStyle.h	2011-03-29 12:23:52 +0000
+++ src/PanelStyle.h	2011-04-16 17:36:41 +0000
@@ -62,6 +62,8 @@
 
     sigc::signal<void> changed;
 
+    bool IsAmbianceOrRadiance ();
+
   private:
     void        Refresh ();
     static void OnStyleChanged (GObject*    gobject,