Merge lp:~unity-team/unity/fixes-2011-04-04 into lp:unity

[Neil J. Patel]

Bugs attached plus some misc fixes.

[Tim Penhey (thumper)]

On Fri, 08 Apr 2011 01:42:07 you wrote:
> +bool
> +PlaceFactoryFile::DoSortThemMister (Place *aa, Place *bb)
> +{
> +#define FIRST "/com/canonical/unity/applicationsplace"
> +#define SECOND "/com/canonical/unity/filesplace"
> +

For the love of clean code, what is wrong with:

  static const char* const apps_place =
"/com/canonical/unity/applicationsplace";
  static const char* const files_place = "/com/canonical/unity/filesplace";

#defines are brutal hammers that just aren't needed in places like this.

=== modified file 'src/IndicatorObjectFactoryRemote.cpp'
--- src/IndicatorObjectFactoryRemote.cpp	2011-03-31 22:02:34 +0000
+++ src/IndicatorObjectFactoryRemote.cpp	2011-04-07 13:41:22 +0000
@@ -537,8 +537,8 @@
   }
   else if (g_strcmp0 (signal_name, "EntryShowNowChanged") == 0)
   {
-    gchar *id = NULL;
-    bool   show_now_state;
+    gchar    *id = NULL;
+    gboolean  show_now_state;
 
     g_variant_get (parameters, "(sb)", &id, &show_now_state);
 
 
=== modified file 'src/LauncherIcon.cpp'
--- src/LauncherIcon.cpp	2011-04-06 17:53:41 +0000
+++ src/LauncherIcon.cpp	2011-04-07 13:41:22 +0000
@@ -71,6 +71,7 @@
   _mouse_inside = false;
   _has_visible_window = false;
   _tooltip = new nux::Tooltip ();
+  _tooltip->SinkReference ();
   _icon_type = TYPE_NONE;
   _sort_priority = 0;
   _shortcut = 0;
@@ -79,6 +80,7 @@
   _superkey_label = 0;
 
   _quicklist = new QuicklistView ();
+  _quicklist->SinkReference ();
   _quicklist_is_initialized = false;
   
   _present_time_handle = 0;
@@ -133,6 +135,9 @@
 
   if (on_order_changed_connection.connected ())
     on_order_changed_connection.disconnect ();
+
+  _quicklist->UnReference ();
+  _tooltip->UnReference ();
 }
 
 bool
 
=== modified file 'src/LauncherIcon.h'
--- src/LauncherIcon.h	2011-03-31 20:33:43 +0000
+++ src/LauncherIcon.h	2011-04-07 13:41:22 +0000
@@ -88,6 +88,7 @@
     
     void    SetShortcut (guint64 shortcut);
     guint64 GetShortcut ();
+    void SetSortPriority (int priority);
     
     void RecvMouseEnter ();
     void RecvMouseLeave ();
@@ -182,7 +183,6 @@
     void Unpresent ();
     
     void SetIconType (IconType type);
-    void SetSortPriority (int priority);
 
     void SetEmblem (nux::BaseTexture *emblem);
     void SetSuperkeyLabel (nux::BaseTexture* label);
 
=== modified file 'src/PanelController.cpp'
--- src/PanelController.cpp	2011-03-29 16:02:03 +0000
+++ src/PanelController.cpp	2011-04-07 13:41:22 +0000
@@ -134,8 +134,12 @@
       (*it)->EnableInputWindow (true);
       (*it)->InputWindowEnableStruts (true);
 
+      g_debug ("PanelController:: Updated Panel for Monitor %d", i);
+
       i++;
     }
+    else
+      break;
   }
 
   // Add new ones if needed
@@ -181,6 +185,8 @@
         unity_util_accessible_add_window (window);
 
       _windows.push_back (window);
+
+      g_debug ("PanelController:: Added Panel for Monitor %d", i);
     }
   }
 
@@ -190,6 +196,7 @@
     for (sit = it; sit != eit; ++sit)
     {
       (*sit)->UnReference ();
+      g_debug ("PanelController:: Removed extra Panel");
     }
 
     _windows.erase (it, _windows.end ());
 
=== modified file 'src/PanelHomeButton.cpp'
--- src/PanelHomeButton.cpp	2011-04-06 17:53:41 +0000
+++ src/PanelHomeButton.cpp	2011-04-07 13:41:22 +0000
@@ -56,7 +56,7 @@
                                             G_CALLBACK (PanelHomeButton::OnIconThemeChanged), this);
 
   UBusServer *ubus = ubus_server_get_default ();
-  ubus_server_register_interest (ubus, UBUS_LAUNCHER_ICON_URGENT_CHANGED,
+  _urgent_interest = ubus_server_register_interest (ubus, UBUS_LAUNCHER_ICON_URGENT_CHANGED,
                                  (UBusCallback)&PanelHomeButton::OnLauncherIconUrgentChanged,
                                  this);
 
@@ -67,6 +67,8 @@
 {
   if (_theme_changed_id)
     g_signal_handler_disconnect (gtk_icon_theme_get_default (), _theme_changed_id);
+
+  ubus_server_unregister_interest (ubus_server_get_default (), _urgent_interest);
 }
 
 void 
 
=== modified file 'src/PanelHomeButton.h'
--- src/PanelHomeButton.h	2011-03-29 12:23:52 +0000
+++ src/PanelHomeButton.h	2011-04-07 13:41:22 +0000
@@ -60,6 +60,7 @@
   int _urgent_count;
   
   gulong _theme_changed_id;
+  guint _urgent_interest;
 };
 
 #endif // PANEL_HOME_BUTTON_H
 
=== modified file 'src/PanelMenuView.cpp'
--- src/PanelMenuView.cpp	2011-04-07 08:48:01 +0000
+++ src/PanelMenuView.cpp	2011-04-07 13:41:22 +0000
@@ -100,7 +100,7 @@
   _on_winbutton_redraw_signal_connection = _window_buttons->redraw_signal.connect (sigc::mem_fun (this, &PanelMenuView::OnWindowButtonsRedraw));
 
   _panel_titlebar_grab_area = new PanelTitlebarGrabArea ();
-  _panel_titlebar_grab_area->Reference ();
+  _panel_titlebar_grab_area->SinkReference ();
   _on_titlebargrab_mouse_down_connnection = _panel_titlebar_grab_area->mouse_down.connect (sigc::mem_fun (this, &PanelMenuView::OnMaximizedGrab));
   _on_titlebargrab_mouse_doubleleftclick_connnection = _panel_titlebar_grab_area->mouse_doubleleftclick.connect (sigc::mem_fun (this, &PanelMenuView::OnMouseDoubleClicked));
   _on_titlebargrab_mouse_middleclick_connnection = _panel_titlebar_grab_area->mouse_middleclick.connect (sigc::mem_fun (this, &PanelMenuView::OnMouseMiddleClicked));
 
=== modified file 'src/PlaceFactoryFile.cpp'
--- src/PlaceFactoryFile.cpp	2011-03-09 12:40:14 +0000
+++ src/PlaceFactoryFile.cpp	2011-04-07 13:41:22 +0000
@@ -17,6 +17,8 @@
  */
 #include "config.h"
 
+#include <algorithm>
+
 #include "PlaceFactoryFile.h"
 
 #include "PlaceRemote.h"
@@ -120,7 +122,6 @@
       if (place->IsValid ())
       {
         _places.push_back (place);
-        place_added.emit (place);
       }
       else
         delete place;
@@ -142,11 +143,43 @@
     return;
   }
 
+  // Sort them
+  std::sort (_places.begin (), _places.end (), DoSortThemMister);
+
+  // Signal their creation
+  std::vector<Place *>::iterator it, eit = _places.end ();
+  for (it = _places.begin (); it != eit; ++it)
+  {
+    place_added.emit (*it);
+    g_debug ("%s", static_cast<PlaceRemote *> (*it)->GetDBusPath ());
+  }
+
   read_directory = true;
 
   g_object_unref (enumerator);
 }
 
+bool
+PlaceFactoryFile::DoSortThemMister (Place *aa, Place *bb)
+{
+#define FIRST "/com/canonical/unity/applicationsplace"
+#define SECOND "/com/canonical/unity/filesplace"
+
+  PlaceRemote *a = static_cast<PlaceRemote *> (aa);
+  PlaceRemote *b = static_cast<PlaceRemote *> (bb);
+
+  if (g_strcmp0 (a->GetDBusPath (), FIRST) == 0)
+    return true;
+  else if (g_strcmp0 (b->GetDBusPath (), FIRST) == 0)
+    return false;
+  else if (g_strcmp0 (a->GetDBusPath (), SECOND) == 0)
+    return true;
+  else if (g_strcmp0 (b->GetDBusPath (), SECOND) == 0)
+    return false;
+  else
+    return g_strcmp0 (a->GetDBusPath (), b->GetDBusPath ()) == 0;
+}
+
 /*
  * C to C++ glue
  */
 
=== modified file 'src/PlaceFactoryFile.h'
--- src/PlaceFactoryFile.h	2010-12-10 18:40:26 +0000
+++ src/PlaceFactoryFile.h	2011-04-07 13:41:22 +0000
@@ -42,10 +42,12 @@
   /* Callbacks, not interesting to others */
   void OnDirectoryEnumerationReady (GObject      *source,
                                     GAsyncResult *result);
-
+private:
+  static bool DoSortThemMister (Place *a, Place *b);
+ 
 public:
   /* For Debugging */
-  bool read_directory;  
+  bool read_directory;
 
 private:
   char  *_directory;
 
=== modified file 'src/PlaceLauncherSection.cpp'
--- src/PlaceLauncherSection.cpp	2011-03-29 14:36:45 +0000
+++ src/PlaceLauncherSection.cpp	2011-04-07 13:41:22 +0000
@@ -21,7 +21,8 @@
 #include "PlaceLauncherSection.h"
 
 PlaceLauncherSection::PlaceLauncherSection (Launcher *launcher)
-: _launcher (launcher)
+: _launcher (launcher),
+  _priority (10000)
 {
   _factory = PlaceFactory::GetDefault ();
   _on_place_added_connection = (sigc::connection) _factory->place_added.connect (sigc::mem_fun (this, 
@@ -49,6 +50,7 @@
     if (entry->ShowInLauncher ())
     {
       PlaceLauncherIcon *icon = new PlaceLauncherIcon (_launcher, entry);
+      icon->SetSortPriority (_priority++);
       IconAdded.emit (icon);
     }
   }
@@ -73,9 +75,9 @@
       if (entry->ShowInLauncher ())
       {
         PlaceLauncherIcon *icon = new PlaceLauncherIcon (_launcher, entry);
+        icon->SetSortPriority (_priority++);
         IconAdded.emit (icon);
       }
     }
   }
 }
-
 
=== modified file 'src/PlaceLauncherSection.h'
--- src/PlaceLauncherSection.h	2011-03-29 14:36:45 +0000
+++ src/PlaceLauncherSection.h	2011-04-07 13:41:22 +0000
@@ -43,6 +43,8 @@
   Launcher     *_launcher;
   PlaceFactory *_factory;
   sigc::connection _on_place_added_connection;
+
+  guint32 _priority;
 };
 
 #endif // _PLACE_LAUNCHER_SECTION_H_
 
=== modified file 'src/PlaceRemote.cpp'
--- src/PlaceRemote.cpp	2011-03-09 19:57:01 +0000
+++ src/PlaceRemote.cpp	2011-04-07 13:41:22 +0000
@@ -204,6 +204,12 @@
     g_object_unref (_activation_proxy);
 }
 
+const gchar * 
+PlaceRemote::GetDBusPath ()
+{
+  return _dbus_path;
+}
+
 void
 PlaceRemote::Connect ()
 {
 
=== modified file 'src/PlaceRemote.h'
--- src/PlaceRemote.h	2011-03-09 16:26:43 +0000
+++ src/PlaceRemote.h	2011-04-07 13:41:22 +0000
@@ -47,7 +47,7 @@
   void OnEntryAdded   (GVariant    *args);
   void OnEntryRemoved (const gchar *dbus_path);
 
-  const gchar * GetDBusName ();
+  const gchar * GetDBusPath ();
 
   void ActivateResult (const char *uri, const char *mimetype);
 
 
=== modified file 'src/PlacesController.cpp'
--- src/PlacesController.cpp	2011-04-06 16:35:35 +0000
+++ src/PlacesController.cpp	2011-04-07 13:41:22 +0000
@@ -252,7 +252,7 @@
       width += tile_width;
 
     width = MAX (width, tile_width * 7);
-    height = ((width/tile_width) - 3) * tile_width;
+    height = MIN (rect.height, (style->GetTileHeight () * 5.5) + 12);
 
     _view->SetSizeMode (PlacesView::SIZE_MODE_HOVER);
     style->SetDefaultNColumns (6);
 
=== modified file 'src/PlacesHorizontalTile.cpp'
--- src/PlacesHorizontalTile.cpp	2011-03-29 22:16:19 +0000
+++ src/PlacesHorizontalTile.cpp	2011-04-07 13:41:22 +0000
@@ -47,16 +47,17 @@
   _comment = g_strdup_printf ("<small>%s</small>", comment);
 
   int w = (PlacesSettings::GetDefault ()->GetDefaultTileWidth () * 2) - icon_size - 24;//padding
+  int lines = 0;
 
   nux::HLayout *layout = new nux::HLayout ("", NUX_TRACKER_LOCATION);
-  layout->AddLayout (new nux::SpaceLayout (0, 0, 12, 12));
+  layout->AddLayout (new nux::SpaceLayout (6, 6, 0, 0));
 
   _icontex = new IconTexture (_icon, icon_size, defer_icon_loading);
-  _icontex->SetMinMaxSize (icon_size * 1.5, icon_size);
+  _icontex->SetMinMaxSize (icon_size, icon_size);
   AddChild (_icontex);
-  layout->AddView (_icontex, 0, nux::eCenter, nux::eFull);
+  layout->AddView (_icontex, 0, nux::eLeft, nux::eFix);
 
-  layout->AddLayout (new nux::SpaceLayout (0, 0, 12, 12));
+  layout->AddLayout (new nux::SpaceLayout (6, 6, 0, 0));
   
   nux::VLayout *vlayout = new nux::VLayout ("", NUX_TRACKER_LOCATION);
   layout->AddView (vlayout, 1, nux::eLeft, nux::eFull);
@@ -66,12 +67,14 @@
   _cairotext = new nux::StaticCairoText (_label);
   _cairotext->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_LEFT);
   _cairotext->SetMaximumWidth (w);
+  _cairotext->SetLines (-2);
   vlayout->AddView (_cairotext, 0, nux::eLeft, nux::eFull);
+  lines = _cairotext->GetLineCount ();
 
   _cairotext = new nux::StaticCairoText (_comment);
   _cairotext->SetTextEllipsize (nux::StaticCairoText::NUX_ELLIPSIZE_END);
   _cairotext->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_LEFT);
-  _cairotext->SetLines (-3);
+  _cairotext->SetLines (-1 * (4 - lines));
   _cairotext->SetMaximumWidth (w);
   _cairotext->SetTextColor (nux::Color (1.0f, 1.0f, 1.0f, 0.8f));
   vlayout->AddView (_cairotext, 1, nux::eLeft, nux::eFull);
@@ -197,13 +200,12 @@
 {
   nux::Geometry base = GetGeometry ();
   int width = 0, height = 0;
-
   _icontex->GetTextureSize (&width, &height);
-  
-  _highlight_geometry.x = 12;
-  _highlight_geometry.y = 12;
-  _highlight_geometry.width = width;
-  _highlight_geometry.height = height;
+
+  _highlight_geometry.x = 6;
+  _highlight_geometry.y = 6;
+  _highlight_geometry.width = _icontex->GetMaximumWidth ();
+  _highlight_geometry.height = base.height - 12;
 
   return _highlight_geometry;
 }
 
=== modified file 'src/PlacesSettings.cpp'
--- src/PlacesSettings.cpp	2011-03-13 19:23:11 +0000
+++ src/PlacesSettings.cpp	2011-04-07 13:41:22 +0000
@@ -20,6 +20,7 @@
 #include "gdk/gdk.h"
 
 #include "PlacesSettings.h"
+#include "PlacesStyle.h"
 
 #define HOME_EXPANDED "home-expanded"
 
@@ -91,8 +92,7 @@
 int
 PlacesSettings::GetDefaultTileWidth ()
 {
-  //FIXME: We want to calculate this from DPI
-  return 140;
+  return PlacesStyle::GetDefault ()->GetTileWidth ();
 }
 
 PlacesSettings::DashBlurType
 
=== modified file 'src/PlacesSimpleTile.cpp'
--- src/PlacesSimpleTile.cpp	2011-03-29 15:57:38 +0000
+++ src/PlacesSimpleTile.cpp	2011-04-07 13:41:22 +0000
@@ -20,7 +20,7 @@
  *
  */
 
-#include "PlacesSettings.h"
+#include "PlacesStyle.h"
 #include "ubus-server.h"
 #include "UBusMessages.h"
 
@@ -40,29 +40,30 @@
   _icon (NULL),
   _uri (NULL)
 {
+  PlacesStyle *style = PlacesStyle::GetDefault ();
   nux::VLayout *layout = new nux::VLayout ("", NUX_TRACKER_LOCATION);
 
   _label = g_strdup (label);
   _icon = g_strdup (icon_name);
 
   _icontex = new IconTexture (_icon, icon_size, defer_icon_loading);
-  _icontex->SetMinMaxSize (PlacesSettings::GetDefault ()->GetDefaultTileWidth (), icon_size);
+  _icontex->SetMinMaxSize (style->GetTileWidth (), icon_size);
   _icontex->SinkReference ();
   AddChild (_icontex);
 
-  _cairotext = new nux::StaticCairoText (_label);
+  _cairotext = new nux::StaticCairoText ("");
+  _cairotext->SetMaximumWidth (style->GetTileWidth ());
   _cairotext->SinkReference ();
-
   _cairotext->SetTextEllipsize (nux::StaticCairoText::NUX_ELLIPSIZE_START);
   _cairotext->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_CENTRE);
-  _cairotext->SetMaximumWidth (140);
-
+  _cairotext->SetText (_label);
+  
   layout->AddLayout (new nux::SpaceLayout (0, 0, 12, 12));
   layout->AddView (_icontex, 0, nux::eCenter, nux::eFull);
   layout->AddLayout (new nux::SpaceLayout (0, 0, 12, 12));
   layout->AddView (_cairotext, 0, nux::eCenter, nux::eFull);
 
-  SetMinMaxSize (160, 128);
+  SetMinMaxSize (style->GetTileWidth (), style->GetTileHeight ());
 
   SetLayout (layout);
 
 
=== modified file 'src/PlacesTile.cpp'
--- src/PlacesTile.cpp	2011-04-06 17:53:41 +0000
+++ src/PlacesTile.cpp	2011-04-07 13:41:22 +0000
@@ -115,9 +115,7 @@
                                        true);
   cairo_fill (cr);
   cairo_graphics->BlurSurface (BLUR_SIZE - 2);
-	
-  // draw tiled background
-  // set up clip path
+
   cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
   cairo_graphics->DrawRoundedRectangle (cr,
                                         1.0,
@@ -128,44 +126,21 @@
                                         bg_height,
                                         true);
   cairo_clip (cr);
-
-  int              w, h;
-  cairo_surface_t *image;
-  cairo_pattern_t *pattern;
-
-  cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 1.0);
-  image = cairo_image_surface_create_from_png (PKGDATADIR"/places-tile-bg-tilable.png");
-  w = cairo_image_surface_get_width (image);
-  h = cairo_image_surface_get_height (image);
-
-
-  pattern = cairo_pattern_create_for_surface (image);
-  cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
-
-  cairo_set_source (cr, pattern);
-
-  cairo_rectangle (cr, 0, 0, base.width, base.height);
-  cairo_fill (cr);
-
-  cairo_pattern_destroy (pattern);
-  cairo_surface_destroy (image);
-
-  // draw the outline
-	
   cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 
   cairo_graphics->DrawRoundedRectangle (cr,
                                         1.0,
                                         bg_x,
-                                       	bg_y,
+                                        bg_y,
                                         5.0,
                                         bg_width,
                                         bg_height,
                                         true);
-  cairo_set_source_rgba (cr, 0.66, 0.66, 0.66, 1.0);
-  cairo_set_line_width (cr, 1.0);
-  cairo_stroke (cr);
-  
+  cairo_set_source_rgba (cr, 240/255.0f, 240/255.0f, 240/255.0f, 1.0f);
+  cairo_fill_preserve (cr);
+
+  cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 1.0);
+  cairo_stroke (cr); 
   
   cairo_destroy (cr);
 
 
=== modified file 'src/QuicklistMenuItemCheckmark.cpp'
--- src/QuicklistMenuItemCheckmark.cpp	2011-04-06 17:53:41 +0000
+++ src/QuicklistMenuItemCheckmark.cpp	2011-04-07 13:41:22 +0000
@@ -191,7 +191,7 @@
       texture = _normalTexture[0]->GetDeviceTexture ();
     }
 
-    _color = nux::Colors::Gray;
+    _color = nux::Color (0.8f, 0.8f, 0.8f, 1.0f);
   }
   
   gfxContext.QRP_1Tex (base.x,
 
=== modified file 'src/QuicklistMenuItemLabel.cpp'
--- src/QuicklistMenuItemLabel.cpp	2011-04-06 17:53:41 +0000
+++ src/QuicklistMenuItemLabel.cpp	2011-04-07 13:41:22 +0000
@@ -162,7 +162,7 @@
   else
   {
     texture = _normalTexture[0]->GetDeviceTexture ();
-    _color = nux::Colors::Gray;
+    _color = nux::Color (0.8f, 0.8f, 0.8f, 1.0f);
   }
 
   gfxContext.QRP_1Tex (base.x,
 
=== modified file 'src/QuicklistMenuItemRadio.cpp'
--- src/QuicklistMenuItemRadio.cpp	2011-04-06 17:53:41 +0000
+++ src/QuicklistMenuItemRadio.cpp	2011-04-07 13:41:22 +0000
@@ -191,7 +191,7 @@
       texture = _normalTexture[0]->GetDeviceTexture ();
     }
 
-      _color = nux::Colors::Gray;
+    _color = nux::Color (0.8f, 0.8f, 0.8f, 1.0f);
   }
 
   gfxContext.QRP_1Tex (base.x,
 
=== modified file 'src/StaticCairoText.cpp'
--- src/StaticCairoText.cpp	2011-03-29 22:16:19 +0000
+++ src/StaticCairoText.cpp	2011-04-07 13:41:22 +0000
@@ -36,7 +36,8 @@
   _fontstring (NULL),
   _cairoGraphics (NULL),
   _texture2D (NULL),
-  _lines (-2)
+  _lines (-2),
+  _actual_lines (0)
 
 {
   _textColor  = Color(1.0f, 1.0f, 1.0f, 1.0f);
@@ -260,6 +261,11 @@
   sigFontChanged.emit (this);
 }
 
+int 
+StaticCairoText::GetLineCount ()
+{
+  return _actual_lines;
+}
 
 void StaticCairoText::GetTextExtents (int &width, int &height)
 {
@@ -447,6 +453,8 @@
   cairo_move_to (cr, 0.0f, 0.0f);
   pango_cairo_show_layout (cr, layout);
 
+  _actual_lines = pango_layout_get_line_count (layout);
+
   // clean up
   pango_font_description_free (desc);
   g_object_unref (layout);
 
=== modified file 'src/StaticCairoText.h'
--- src/StaticCairoText.h	2011-03-29 22:16:19 +0000
+++ src/StaticCairoText.h	2011-04-07 13:41:22 +0000
@@ -86,7 +86,9 @@
       void SetTextAlignment (AlignState state);
       void SetTextVerticalAlignment (AlignState state);
       void SetFont (const char *fontstring);
-      void SetLines (int lines);
+      void SetLines (int maximum_lines);
+
+      int  GetLineCount ();
 
       void GetTextExtents (int &width, int &height);
 
@@ -113,6 +115,7 @@
       int            _pre_layout_height;
 
       int            _lines;
+      int            _actual_lines;
 
       void GetTextExtents (const TCHAR* font,
                            int&         width,