Merge lp:~njpatel/unity/fix-panel-tray into lp:unity

[Neil J. Patel]

This fixes:

- RGBA tray icons being broken
- Tray icon window being the wrong size
- Tray icon window blocking mouse input to other indicators
- Tray icon window positioning
- Tray icon mathematics, which were not taking into account icons that we ignored when they were removed

=== modified file 'plugins/unityshell/src/PanelTray.cpp'
--- plugins/unityshell/src/PanelTray.cpp	2011-08-11 05:11:58 +0000
+++ plugins/unityshell/src/PanelTray.cpp	2011-08-30 13:44:29 +0000
@@ -32,7 +32,7 @@
 {
 
 PanelTray::PanelTray()
-  : _n_children(0),
+  : _window(0),
     _tray(NULL),
     _last_x(0),
     _last_y(0),
@@ -41,6 +41,11 @@
   _settings = g_settings_new(SETTINGS_NAME);
   _whitelist = g_settings_get_strv(_settings, "systray-whitelist");
 
+  RealInit();
+}
+
+void PanelTray::RealInit()
+{
   _window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_window_set_type_hint(GTK_WINDOW(_window), GDK_WINDOW_TYPE_HINT_DOCK);
   gtk_window_set_has_resize_grip(GTK_WINDOW(_window), FALSE);
@@ -48,8 +53,22 @@
   gtk_window_set_skip_pager_hint(GTK_WINDOW(_window), TRUE);
   gtk_window_set_skip_taskbar_hint(GTK_WINDOW(_window), TRUE);
   gtk_window_resize(GTK_WINDOW(_window), 1, 24);
-  SetMinMaxSize(1, 24);
-  gtk_window_move(GTK_WINDOW(_window), 200, 12);
+
+  /*
+  GtkStyleContext* style_context = gtk_widget_get_style_context(_window);
+
+  GtkWidgetPath* widget_path = gtk_widget_path_new();
+  guint pos = gtk_widget_path_append_type(widget_path, GTK_TYPE_WINDOW);
+  gtk_widget_path_iter_set_name(widget_path, pos, "UnityPanelWidget");
+
+  gtk_style_context_set_path(style_context, widget_path);
+  gtk_style_context_add_class(style_context, "gnome-panel-menu-bar");
+  gtk_style_context_add_class(style_context, "unity-panel");
+
+  gtk_widget_path_free(widget_path);
+  */
+  
+  gtk_window_move(GTK_WINDOW(_window), -24,-24);
   gtk_widget_set_name(_window, "UnityPanelApplet");
 
   gtk_widget_set_visual(_window, gdk_screen_get_rgba_visual(gdk_screen_get_default()));
@@ -63,6 +82,7 @@
                                    GTK_ORIENTATION_HORIZONTAL,
                                    (NaTrayFilterCallback)FilterTrayCallback,
                                    this);
+    na_tray_set_icon_size(_tray, 24);
 
     _tray_icon_added_id = g_signal_connect(na_tray_get_manager(_tray), "tray_icon_removed",
                                            G_CALLBACK(PanelTray::OnTrayIconRemoved), this);
@@ -70,6 +90,9 @@
     gtk_container_add(GTK_CONTAINER(_window), GTK_WIDGET(_tray));
     gtk_widget_show(GTK_WIDGET(_tray));
   }
+
+  SetMinMaxSize(1, 24);
+
 }
 
 PanelTray::~PanelTray()
@@ -115,11 +138,11 @@
 {
   if (_tray)
   {
-    SetMinMaxSize((_n_children * 24) + (PADDING * 2), 24);
+    SetMinMaxSize(WidthOfTray() + (PADDING * 2), 24);
     QueueRelayout();
     QueueDraw();
 
-    if (_n_children)
+    if (_children.size())
       gtk_widget_show(_window);
     else
       gtk_widget_hide(_window);
@@ -167,7 +190,7 @@
     if (na_tray_child_has_alpha(icon))
       na_tray_child_set_composited(icon, TRUE);
 
-    self->_n_children++;
+    self->_children.push_back(icon);
     g_idle_add((GSourceFunc)IdleSync, self);
   }
 
@@ -186,18 +209,37 @@
 void
 PanelTray::OnTrayIconRemoved(NaTrayManager* manager, NaTrayChild* child, PanelTray* self)
 {
-  g_idle_add((GSourceFunc)IdleSync, self);
-  if (self->_n_children > 0)
-    self->_n_children--;
+  for (auto it = self->_children.begin(); it != self->_children.end(); ++it)
+  {
+    if (*it == child)
+    {
+      g_idle_add((GSourceFunc)IdleSync, self);
+      self->_children.erase(it);
+      break;
+    }
+  }
 }
 
 gboolean
 PanelTray::IdleSync(PanelTray* self)
 {
+  int width = self->WidthOfTray();
+  gtk_window_resize(GTK_WINDOW(self->_window), width, 24);
   self->Sync();
   return FALSE;
 }
 
+int PanelTray::WidthOfTray()
+{
+  int width = 0;
+  for (auto child: _children)
+  {
+    int w = gtk_widget_get_allocated_width(GTK_WIDGET(child));
+    width += w > 24 ? w : 24;
+  }
+  return width;
+}
+
 gboolean
 PanelTray::OnTrayDraw(GtkWidget* widget, cairo_t* cr, PanelTray* tray)
 {
@@ -205,9 +247,6 @@
 
   gtk_widget_get_allocation(widget, &alloc);
 
-  //gdk_cairo_region (cr, ev->region);
-  cairo_clip(cr);
-
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 

=== modified file 'plugins/unityshell/src/PanelTray.h'
--- plugins/unityshell/src/PanelTray.h	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/PanelTray.h	2011-08-30 13:44:29 +0000
@@ -39,6 +39,7 @@
 class PanelTray : public PanelIndicatorObjectView
 {
 public:
+  typedef std::vector<NaTrayChild*> TrayChildren;
   PanelTray();
   ~PanelTray();
 
@@ -49,7 +50,6 @@
   virtual void OnEntryAdded(unity::indicator::Entry::Ptr const& proxy);
 
 public:
-  guint8     _n_children;
   char**     _whitelist;
 protected:
   const gchar* GetName();
@@ -61,11 +61,15 @@
   static void     OnTrayIconRemoved(NaTrayManager* manager, NaTrayChild* child, PanelTray* self);
   static gboolean IdleSync(PanelTray* tray);
   static gboolean OnTrayDraw(GtkWidget* widget, cairo_t* cr, PanelTray* tray);
+  
+  void RealInit();
+  int WidthOfTray();
 
 private:
   GSettings* _settings;
   GtkWidget* _window;
   NaTray*    _tray;
+  TrayChildren _children;
   int        _last_x;
   int        _last_y;