Merge lp:~larochelle-brian/unity/SwitcherView-Font-resubmit into lp:unity

[brian larochelle]

revised per andyrock's suggestions. based on new cleaner unity branch. removing original proposed branch

[Marco Trevisan (Treviño) (3v1n0)]

This is fine, but would you mind to add a new field to StaticCairo text to define font size and then use pango_font_description_set_size in GetTextExtents and DrawText to, in case it's valid, override the given value?

[Andrea Azzarone (azzar1)]

> This is fine, but would you mind to add a new field to StaticCairo text to
> define font size and then use pango_font_description_set_size in
> GetTextExtents and DrawText to, in case it's valid, override the given value?

Don't ask too much Marco :D

Hey Brian, I don't like code duplication of

text_view_->SetText("<span font='10'><b>" + selection->tooltip_text() + "</b></span>");

Can you remove it? Move it in a function for example ;)

[brian larochelle (larochelle-brian)]

Andrea - sure, np. I'd like to learn as much as I can, so I'd like to poke around with Marco's suggestions first.
thanks :)

[Christopher Townsend (townsend)]

Hi Brian,

I'm going to set the Status to "Work in progress". When you are ready, please set the status back to "Needs review".

Thanks!

Unmerged revisions

3426. By brian larochelle on 2013-07-13

alt+tab switches doesn't follow system font.
remove SetFont, and wrap text with size and bold in html <span> tags, hardcoded
to 10 and bold.

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2013-06-14 00:23:34 +0000
+++ launcher/SwitcherView.cpp	2013-07-13 03:26:25 +0000
@@ -63,7 +63,6 @@
   text_view_->SetMaximumWidth(tile_size * spread_size);
   text_view_->SetLines(1);
   text_view_->SetTextColor(nux::color::White);
-  text_view_->SetFont("Ubuntu Bold 10");
 
   icon_size.changed.connect (sigc::mem_fun (this, &SwitcherView::OnIconSizeChanged));
   tile_size.changed.connect (sigc::mem_fun (this, &SwitcherView::OnTileSizeChanged));
@@ -124,7 +123,7 @@
   text_view_->SetVisible(!model->detail_selection);
 
   if (!model->detail_selection)
-    text_view_->SetText(model->Selection()->tooltip_text());
+    text_view_->SetText("<span font='10'><b>" + model->Selection()->tooltip_text() + "</b></span>");
 }
 
 void SwitcherView::OnIconSizeChanged (int size)
@@ -169,7 +168,7 @@
 
   if (!detail)
   {
-    text_view_->SetText(model_->Selection()->tooltip_text());
+    text_view_->SetText("<span font='10'><b>" + model_->Selection()->tooltip_text() + "</b></span>");
     render_targets_.clear();
   }
 
@@ -180,7 +179,7 @@
 void SwitcherView::OnSelectionChanged(AbstractLauncherIcon::Ptr const& selection)
 {
   if (selection)
-    text_view_->SetText(selection->tooltip_text());
+    text_view_->SetText("<span font='10'><b>" + selection->tooltip_text() + "</b></span>");
 
   SaveLast();
   QueueDraw();