Merge lp:~3v1n0/unity/saticcairo-text-sizes-fix into lp:unity

[Marco Trevisan (Treviño)]

StaticCairoText: recompute the extents if they exceed the maximum size

Keep the texture the most little that we can, then adjust its position when drawing.

Both the visual issues introduced in recent static-cairo text fixed, but keeping the fixes of the previous branch.
See: http://i.imgur.com/1tDNgzv.png

Now we we always compute the extents leaving the text to use all the spaces it needs, then we adjust it to match our maximum size.

Also the texture is using only the space it needs, while we adjust its position (based on alignment) when drawing.

[Andrea Azzarone (azzar1)]

Works here. Changes looks good. Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'unity-shared/SearchBar.cpp'
--- unity-shared/SearchBar.cpp	2012-12-17 18:00:40 +0000
+++ unity-shared/SearchBar.cpp	2013-03-15 15:09:25 +0000
@@ -187,7 +187,7 @@
     show_filters_->SetFont(SHOW_FILTERS_LABEL_DEFAULT_FONT.c_str());
     show_filters_->SetTextColor(nux::color::White);
     show_filters_->SetTextAlignment(StaticCairoText::NUX_ALIGN_RIGHT);
-    show_filters_->SetLines(1);
+    show_filters_->SetLines(-1);
 
     nux::BaseTexture* arrow;
     arrow = style.GetGroupExpandIcon();

=== modified file 'unity-shared/SearchBar.h'
--- unity-shared/SearchBar.h	2012-12-14 12:14:34 +0000
+++ unity-shared/SearchBar.h	2013-03-15 15:09:25 +0000
@@ -68,7 +68,6 @@
   sigc::signal<void, std::string const&> live_search_reached;
 
 private:
-
   void Init();
 
   void OnFontChanged(GtkSettings* settings, GParamSpec* pspec=NULL);

=== modified file 'unity-shared/StaticCairoText.cpp'
--- unity-shared/StaticCairoText.cpp	2013-03-09 17:24:16 +0000
+++ unity-shared/StaticCairoText.cpp	2013-03-15 15:09:25 +0000
@@ -67,6 +67,8 @@
 
     std::shared_ptr<CairoGraphics> cr;
   };
+
+  void UpdateBaseSize();
   Size GetTextExtents() const;
 
   void SetAttributes(PangoLayout* layout);
@@ -92,7 +94,7 @@
   EllipsizeState ellipsize_;
   AlignState align_;
   AlignState valign_;
-  UnderlineState underline_; 
+  UnderlineState underline_;
 
   std::string font_;
 
@@ -114,7 +116,7 @@
   , text_color_(color::White)
   , ellipsize_(NUX_ELLIPSIZE_END)
   , align_(NUX_ALIGN_LEFT)
-  , valign_(NUX_ALIGN_TOP)
+  , valign_(NUX_ALIGN_CENTRE)
   , underline_(NUX_UNDERLINE_NONE)
   , lines_(-2)  // should find out why -2...
     // the desired height of the layout in Pango units if positive, or desired
@@ -173,7 +175,6 @@
   : View(NUX_FILE_LINE_PARAM)
   , pimpl(new Impl(this, text))
 {
-  SetMinimumSize(1, 1);
   SetAcceptKeyNavFocusOnMouseDown(false);
 }
 
@@ -182,7 +183,6 @@
   : View(NUX_FILE_LINE_PARAM)
   , pimpl(new Impl(this, escape_text ? GetEscapedText(text) : text))
 {
-  SetMinimumSize(1, 1);
   SetAcceptKeyNavFocusOnMouseDown(false);
 }
 
@@ -226,17 +226,14 @@
 
 void StaticCairoText::PreLayoutManagement()
 {
-  Geometry geo = GetGeometry();
+  Geometry const& geo = GetGeometry();
 
   pimpl->pre_layout_size_.width = geo.width;
   pimpl->pre_layout_size_.height = geo.height;
+  pimpl->UpdateBaseSize();
 
-  SetBaseSize(pimpl->cached_extent_.width,
-              pimpl->cached_extent_.height);
   if (pimpl->textures2D_.empty())
-  {
     pimpl->UpdateTexture();
-  }
 
   View::PreLayoutManagement();
 }
@@ -293,15 +290,28 @@
   gfxContext.GetRenderStates().GetBlend(alpha, src, dest);
   gfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-  Color col = color::Black;
-  col.alpha = 0;
-  gfxContext.QRP_Color(base.x,
-                       base.y,
-                       base.width,
-                       base.height,
-                       col);
-
-  int current_y = base.y + ((base.height - pimpl->cached_extent_.height) / 2);
+  gfxContext.QRP_Color(base.x, base.y, base.width, base.height, color::Transparent);
+
+  int current_x = base.x;
+  int current_y = base.y;
+
+  if (pimpl->align_ == NUX_ALIGN_CENTRE)
+  {
+    current_x += std::round((base.width - pimpl->cached_extent_.width) / 2.0f);
+  }
+  else if (pimpl->align_ == NUX_ALIGN_RIGHT)
+  {
+    current_x += base.width - pimpl->cached_extent_.width;
+  }
+
+  if (pimpl->valign_ == NUX_ALIGN_CENTRE)
+  {
+    current_y += std::round((base.height - pimpl->cached_extent_.height) / 2.0f);
+  }
+  else if (pimpl->valign_ == NUX_ALIGN_BOTTOM)
+  {
+    current_y += base.height - pimpl->cached_extent_.height;
+  }
 
   for (BaseTexturePtr tex : pimpl->textures2D_)
   {
@@ -309,7 +319,7 @@
     if (!text_tex)
       break;
 
-    gfxContext.QRP_1Tex(base.x,
+    gfxContext.QRP_1Tex(current_x,
                     current_y,
                     text_tex->GetWidth(),
                     text_tex->GetHeight(),
@@ -406,7 +416,7 @@
 void StaticCairoText::SetFont(std::string const& font)
 {
   if (pimpl->font_ != font)
-  {  
+  {
     pimpl->font_ = font;
     pimpl->need_new_extent_cache_ = true;
     Size s = GetTextExtents();
@@ -501,7 +511,8 @@
 void StaticCairoText::AddProperties(GVariantBuilder* builder)
 {
   unity::variant::BuilderWrapper(builder)
-  .add(GetGeometry());
+  .add(GetGeometry())
+  .add("text", pimpl->text_);
 }
 
 std::string StaticCairoText::Impl::GetEffectiveFont() const
@@ -524,8 +535,6 @@
   PangoLayout*          layout   = NULL;
   PangoFontDescription* desc     = NULL;
   PangoContext*         pangoCtx = NULL;
-  PangoRectangle        inkRect  = {0, 0, 0, 0};
-  PangoRectangle        logRect  = {0, 0, 0, 0};
   int                   dpi      = 0;
   GdkScreen*            screen   = gdk_screen_get_default();    // is not ref'ed
   GtkSettings*          settings = gtk_settings_get_default();  // is not ref'ed
@@ -537,8 +546,7 @@
 
   Size result;
   std::string font = GetEffectiveFont();
-
-  int maxwidth = parent_->GetMaximumWidth();
+  nux::Size layout_size(-1, lines_ < 0 ? lines_ : std::numeric_limits<int>::min());
 
   surface = cairo_image_surface_create(CAIRO_FORMAT_A1, 1, 1);
   cr = cairo_create(surface);
@@ -550,8 +558,8 @@
   pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
   pango_layout_set_ellipsize(layout, GetPangoEllipsizeMode());
   pango_layout_set_alignment(layout, GetPangoAlignment());
-  pango_layout_set_height(layout, lines_);
-  pango_layout_set_width(layout, maxwidth * PANGO_SCALE);
+  pango_layout_set_width(layout, layout_size.width);
+  pango_layout_set_height(layout, layout_size.height);
   pango_layout_set_markup(layout, text_.c_str(), -1);
   pango_layout_set_spacing(layout, line_spacing_ * PANGO_SCALE);
 
@@ -570,15 +578,15 @@
                                        (float) dpi / (float) PANGO_SCALE);
   }
   pango_layout_context_changed(layout);
-  pango_layout_get_extents(layout, &inkRect, &logRect);
-
-  // logRect has some issues using italic style
-  if (inkRect.x + inkRect.width > logRect.x + logRect.width)
-    result.width = std::ceil(static_cast<float>(inkRect.x + inkRect.width - logRect.x) / PANGO_SCALE);
-  else
-    result.width = std::ceil(static_cast<float>(logRect.width) / PANGO_SCALE);
-
-  result.height = std::ceil(static_cast<float>(logRect.height) / PANGO_SCALE);
+  pango_layout_get_pixel_size(layout, &result.width, &result.height);
+
+  if (result.width > parent_->GetMaximumWidth())
+  {
+    pango_layout_set_width(layout, parent_->GetMaximumWidth() * PANGO_SCALE);
+    pango_layout_context_changed(layout);
+    pango_layout_get_pixel_size(layout, &result.width, &result.height);
+  }
+
   cached_extent_ = result;
   baseline_ = pango_layout_get_baseline(layout) / PANGO_SCALE;
   need_new_extent_cache_ = false;
@@ -671,22 +679,8 @@
   if (!texture)
     return;
 
-  nux::Size tex_size(parent_->GetMaximumWidth(), parent_->GetMaximumHeight());
-  nux::Size layout_size(tex_size.width * PANGO_SCALE, tex_size.height * PANGO_SCALE);
-
-  if (tex_size.width == nux::AREA_MAX_WIDTH)
-  {
-    tex_size.width = parent_->GetWidth();
-    layout_size.width = -1;
-  }
-
-  if (tex_size.height == nux::AREA_MAX_HEIGHT)
-  {
-    tex_size.height = parent_->GetHeight();
-    layout_size.height = -1;
-  }
-
-  texture->cr.reset(new CairoGraphics(CAIRO_FORMAT_ARGB32, tex_size.width, tex_size.height));
+  nux::Size layout_size(-1, lines_ < 0 ? lines_ : std::numeric_limits<int>::min());
+  texture->cr.reset(new CairoGraphics(CAIRO_FORMAT_ARGB32, cached_extent_.width, cached_extent_.height));
   cairo_t* cr = texture->cr->GetInternalContext();
 
   PangoLayout*          layout     = NULL;
@@ -702,8 +696,9 @@
   cairo_set_font_options(cr, gdk_screen_get_font_options(screen));
 
   layout = pango_cairo_create_layout(cr);
+
+
   desc = pango_font_description_from_string(font.c_str());
-
   pango_layout_set_font_description(layout, desc);
   pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
   pango_layout_set_ellipsize(layout, GetPangoEllipsizeMode());
@@ -713,8 +708,6 @@
   pango_layout_set_height(layout, layout_size.height);
   pango_layout_set_spacing(layout, line_spacing_ * PANGO_SCALE);
 
-  pango_layout_set_height(layout, lines_);
-
   SetAttributes(layout);
 
   pangoCtx = pango_layout_get_context(layout);  // is not ref'ed
@@ -732,14 +725,22 @@
                                        (float) dpi / (float) PANGO_SCALE);
   }
 
+  Size result;
+  pango_layout_context_changed(layout);
+  pango_layout_get_pixel_size(layout, &result.width, &result.height);
+
+  if (result.width > parent_->GetMaximumWidth())
+  {
+    pango_layout_set_width(layout, parent_->GetMaximumWidth() * PANGO_SCALE);
+    pango_layout_context_changed(layout);
+  }
+
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
   cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
   cairo_set_source_rgba(cr, text_color_.red, text_color_.green, text_color_.blue, text_color_.alpha);
 
-  pango_layout_context_changed(layout);
-
   cairo_move_to(cr, 0.0f, 0.0f);
   pango_cairo_show_layout(cr, layout);
 
@@ -750,10 +751,15 @@
   g_object_unref(layout);
 }
 
+void StaticCairoText::Impl::UpdateBaseSize()
+{
+  parent_->SetBaseSize(cached_extent_.width, cached_extent_.height);
+}
+
 void StaticCairoText::Impl::UpdateTexture()
 {
-  auto const& size = GetTextExtents();
-  parent_->SetBaseSize(size.width, size.height);
+  GetTextExtents();
+  UpdateBaseSize();
 
   textures2D_.clear();
   for (auto const& texture : cache_textures_)