← Back to branch summary

~thomir-deactivatedaccount/unity/switcher-autopilot-test

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/ResultRendererTile.cpp

  • Committer: Didier Roche
  • Date: 2012-03-13 11:57:33 UTC
  • mto: This revision was merged to the branch mainline in revision 2126.
  • Revision ID: didier.roche@canonical.com-20120313115733-c85oulbsszhg2hmp
Xfixes.h is used by plugins/unityshell/src/PointerBarrier* but wasn't listed in the pc file configuration. It was picked by chance by another dep

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/ResultRendererTile.cpp
51
51
namespace
52
52
{
53
53
nux::logging::Logger logger("unity.dash.results");
54
 
 
55
 
const int FONT_SIZE = 10;
56
 
 
57
54
}
58
55
 
59
56
namespace dash
268
265
 
269
266
  if (g_strrstr(icon_name.c_str(), "://"))
270
267
  {
271
 
    container->slot_handle = IconLoader::GetDefault().LoadFromURI(icon_name, style.GetTileIconSize(), slot);
 
268
    container->slot_handle = IconLoader::GetDefault().LoadFromURI(icon_name.c_str(), style.GetTileIconSize(), slot);
272
269
  }
273
270
  else if (G_IS_ICON(icon))
274
271
  {
275
 
    container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(icon_name, style.GetTileIconSize(), slot);
 
272
    container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(icon_name.c_str(), style.GetTileIconSize(), slot);
276
273
  }
277
274
  else
278
275
  {
279
 
    container->slot_handle = IconLoader::GetDefault().LoadFromIconName(icon_name, style.GetTileIconSize(), slot);
 
276
    container->slot_handle = IconLoader::GetDefault().LoadFromIconName(icon_name.c_str(), style.GetTileIconSize(), slot);
280
277
  }
281
278
 
282
279
  if (icon != NULL)
426
423
  cairo_set_font_options(cr, gdk_screen_get_font_options(screen));
427
424
  layout = pango_cairo_create_layout(cr);
428
425
  desc = pango_font_description_from_string(font.Value());
429
 
  pango_font_description_set_size (desc, FONT_SIZE * PANGO_SCALE);
 
426
  pango_font_description_set_size (desc, 9 * PANGO_SCALE);
430
427
 
431
428
  pango_layout_set_font_description(layout, desc);
432
429
  pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);