Merge lp:~azzar1/unity/dash-fonts into lp:unity

[Andrea Azzarone]

The problems
-------------
Bug #927710: No text inside multirange filters
Bug #942508: Dash - Font metrics and colors are wrong

The fix
-------
Update the dash fonts.

Test
----
Not applicable.

http://ubuntuone.com/1a4mdRPJ8tgFrg4bMuNiQE

I've merged lp:~sladen/unity/unity-drunken-spinner-lp943656.

[John Lea (johnlea)]

Where can I see (the testing computer?)

On 05/03/12 20:12, Andrea Azzarone wrote:
> You have been requested to review the proposed merge of lp:~andyrock/unity/dash-fonts into lp:unity.
>
> For more details, see:
> https://code.launchpad.net/~andyrock/unity/dash-fonts/+merge/95989
>
> The problems
> -------------
> Bug #927710: No text inside multirange filters
> Bug #942508: Dash - Font metrics and colors are wrong
>
> The fix
> -------
> Update the dash fonts.
>
> Test
> ----
> Not applicable.
>
>

--
John Lea | Ubuntu Desktop User Experience Lead
Canonical www.canonical.com | Ubuntu www.ubuntu.com
27th Floor, 21-24 Millbank Tower, London, SW1P 4QP
Tel: [phone] | Email: <email address hidden>

[Mirco Müller (macslow)]

> Where can I see (the testing computer?)

http://people.canonical.com/~mmueller/after-927710.png

[Mirco Müller (macslow)]

Looking good sofar. But we need to expose those colors and font-attributes in DashStyle in the long run. Otherwise we'll never get this tweaking off our shoulders.

review: Approve

[Andrea Cimitan (cimi)]

Looking at mirco's screenshot, the text in the search box is not aligned with the category headers.

[John Lea (johnlea)]

Well spotted, let's solve this last issue before landing this fix.

[Andrea Azzarone (azzar1)]

> Looking at mirco's screenshot, the text in the search box is not aligned with
> the category headers.

I need new assets for the search bar icons (64x64 is too big!). I've tried to resize them by myself but I had some problems.

> Looking good sofar. But we need to expose those colors and font-attributes in DashStyle in the long run. Otherwise
> we'll never get this tweaking off our shoulders.

Indeed.

[Andrea Azzarone (azzar1)]

> Well spotted, let's solve this last issue before landing this fix.

Fixed.

[Andrea Cimitan (cimi)]

With the latest fix, from the screenshot the visuals are ok

review: Approve (design)

[Unity Merger (unity-merger)]

No proposals found for merge of lp:~andyrock/unity/fix-748101 into lp:unity.

[Mirco Müller (macslow)]

Updated screenshot after Andy's latest fix-update: http://people.canonical.com/~mmueller/after-927710-2.png

[Mirco Müller (macslow)]

Can we sign this off as approved now John?

[Andrea Azzarone (azzar1)]

> Updated screenshot after Andy's latest fix-update:
> http://people.canonical.com/~mmueller/after-927710-2.png

Can you build this branch from scratch? This screenshot still has the alignment issue.
On my system: http://ubuntuone.com/1a4mdRPJ8tgFrg4bMuNiQE

[Andrea Cimitan (cimi)]

Which is the real screenshot? I only approve the one from andrea.

[John Lea (johnlea)]

review: Approve (design)

=== added file 'plugins/unityshell/resources/search_circle.svg'
--- plugins/unityshell/resources/search_circle.svg	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/resources/search_circle.svg	2012-03-13 16:31:20 +0000
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="close.svg">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2841"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2858"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2872"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2968"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2996"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3840"
+       inkscape:persp3d-origin="512 : 256 : 1"
+       inkscape:vp_z="1024 : 384 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 384 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3947"
+       inkscape:persp3d-origin="512 : 256 : 1"
+       inkscape:vp_z="1024 : 384 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 384 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="30.5625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:document-units="px"
+     inkscape:current-layer="g3950"
+     showgrid="false"
+     inkscape:window-width="1451"
+     inkscape:window-height="975"
+     inkscape:window-x="529"
+     inkscape:window-y="51"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <g
+       id="g3950"
+       transform="translate(-735.82017,643.9392)"
+       style="fill:#2b0000">
+      <g
+         id="g3928"
+         style="fill:#ffffff">
+        <path
+           id="path3932"
+           d="m 744.82017,392.423 c 0,-3.866 3.134,-7 7,-7 3.866,0 7,3.134 7,7 h 2 c 0,-4.971 -4.029,-9 -9,-9 -4.971,0 -9,4.029 -9,9 0,4.971 4.029,9 9,9 v -2 c -3.866,0 -7,-3.134 -7,-7 z"
+           style="fill:#ffffff" />
+        <linearGradient
+           y2="391.6506"
+           x2="753.69513"
+           y1="402.29791"
+           x1="747.54791"
+           gradientUnits="userSpaceOnUse"
+           id="SVGID_1_">
+          <stop
+             id="stop3935"
+             style="stop-color:#FFFFFF"
+             offset="0.1411" />
+          <stop
+             id="stop3937"
+             style="stop-color:#FFFFFF;stop-opacity:0"
+             offset="0.7423" />
+        </linearGradient>
+        <path
+           id="path3939"
+           d="m 760.82017,392.423 h -2 c 0,3.866 -3.134,7 -7,7 v 2 c 4.971,0 9,-4.029 9,-9 z"
+           style="fill:#ffffff;fill-opacity:1" />
+      </g>
+    </g>
+  </g>
+</svg>
 
=== modified file 'plugins/unityshell/resources/search_close.png'
 Binary files plugins/unityshell/resources/search_close.png	2011-04-10 22:12:46 +0000 and plugins/unityshell/resources/search_close.png	2012-03-13 16:31:20 +0000 differ
=== added file 'plugins/unityshell/resources/search_close.svg'
--- plugins/unityshell/resources/search_close.svg	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/resources/search_close.svg	2012-03-13 16:31:20 +0000
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="close.svg">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2841"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2858"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2872"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2968"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2996"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3840"
+       inkscape:persp3d-origin="512 : 256 : 1"
+       inkscape:vp_z="1024 : 384 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 384 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3947"
+       inkscape:persp3d-origin="512 : 256 : 1"
+       inkscape:vp_z="1024 : 384 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 384 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="30.5625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:document-units="px"
+     inkscape:current-layer="g3950"
+     showgrid="false"
+     inkscape:window-width="1451"
+     inkscape:window-height="975"
+     inkscape:window-x="529"
+     inkscape:window-y="51"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <g
+       id="g3950"
+       transform="translate(-735.82017,643.9392)"
+       style="fill:#2b0000">
+      <rect
+         id="rect3924"
+         height="8.7959156"
+         width="2.0459805"
+         transform="matrix(0.70690675,-0.70730675,0.70730675,0.70690675,0,0)"
+         y="804.776"
+         x="252.88033"
+         style="fill:#ffffff" />
+      <rect
+         id="rect3926"
+         height="2.0031226"
+         width="8.7665358"
+         transform="matrix(0.70705678,-0.70715678,0.70715678,0.70705678,0,0)"
+         y="808.11853"
+         x="249.69171"
+         style="fill:#ffffff" />
+    </g>
+  </g>
+</svg>
 
=== modified file 'plugins/unityshell/resources/search_magnify.png'
 Binary files plugins/unityshell/resources/search_magnify.png	2011-04-10 22:12:46 +0000 and plugins/unityshell/resources/search_magnify.png	2012-03-13 16:31:20 +0000 differ
=== modified file 'plugins/unityshell/resources/search_spin.png'
 Binary files plugins/unityshell/resources/search_spin.png	2011-04-10 22:12:46 +0000 and plugins/unityshell/resources/search_spin.png	2012-03-13 16:31:20 +0000 differ
=== added file 'plugins/unityshell/resources/search_spin.svg'
--- plugins/unityshell/resources/search_spin.svg	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/resources/search_spin.svg	2012-03-13 16:31:20 +0000
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="search.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4563">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4565" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4567" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2841"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2858"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2872"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2968"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2996"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3840"
+       inkscape:persp3d-origin="512 : 256 : 1"
+       inkscape:vp_z="1024 : 384 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 384 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3947"
+       inkscape:persp3d-origin="512 : 256 : 1"
+       inkscape:vp_z="1024 : 384 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 384 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4563"
+       id="linearGradient4569"
+       x1="751.82017"
+       y1="396.923"
+       x2="754.34198"
+       y2="394.51682"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.610951"
+     inkscape:cx="19.076277"
+     inkscape:cy="14.90749"
+     inkscape:document-units="px"
+     inkscape:current-layer="g3950"
+     showgrid="false"
+     inkscape:window-width="1451"
+     inkscape:window-height="975"
+     inkscape:window-x="98"
+     inkscape:window-y="155"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <g
+       id="g3950"
+       transform="translate(-735.82017,643.9392)"
+       style="fill:#2b0000">
+      <g
+         id="g3928"
+         style="fill:#ffffff">
+	
+	<path
+   id="path3932"
+   d="m 744.82017,392.423 c 0,-3.866 3.134,-7 7,-7 3.866,0 7,3.134 7,7 h 2 c 0,-4.971 -4.029,-9 -9,-9 -4.971,0 -9,4.029 -9,9 0,4.971 4.029,9 9,9 v -2 c -3.866,0 -7,-3.134 -7,-7 z"
+   style="fill:#ffffff" />
+
+	<linearGradient
+   y2="391.6506"
+   x2="753.69513"
+   y1="402.29791"
+   x1="747.54791"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_1_">
+		<stop
+   id="stop3935"
+   style="stop-color:#FFFFFF"
+   offset="0.1411" />
+
+		<stop
+   id="stop3937"
+   style="stop-color:#FFFFFF;stop-opacity:0"
+   offset="0.7423" />
+
+	</linearGradient>
+
+	<path
+   id="path3939"
+   d="m 760.82017,392.423 h -2 c 0,3.866 -3.134,7 -7,7 v 2 c 4.971,0 9,-4.029 9,-9 z"
+   style="fill:url(#linearGradient4569);fill-opacity:1" />
+
+</g>
+    </g>
+  </g>
+</svg>
 
=== modified file 'plugins/unityshell/src/DashStyle.cpp'
--- plugins/unityshell/src/DashStyle.cpp	2012-02-24 15:19:35 +0000
+++ plugins/unityshell/src/DashStyle.cpp	2012-03-13 16:31:20 +0000
@@ -88,12 +88,13 @@
 class LazyLoadTexture
 {
 public:
-  LazyLoadTexture(std::string const& filename);
+  LazyLoadTexture(std::string const& filename, int size = -1);
   nux::BaseTexture* texture();
 private:
   void LoadTexture();
 private:
   std::string filename_;
+  int size_;
   BaseTexturePtr texture_;
 };
 
@@ -120,7 +121,7 @@
             nux::Color const& color,
             std::string const& label,
             int font_size = -1,
-            double horizMargin = 10.0,
+            double horizMargin = 4.0,
             Alignment alignment = Alignment::CENTER);
 
   void ButtonOutlinePath(cairo_t* cr, bool align);
@@ -205,6 +206,7 @@
   LazyLoadTexture dash_shine_;
 
   LazyLoadTexture search_magnify_texture_;
+  LazyLoadTexture search_circle_texture_;
   LazyLoadTexture search_close_texture_;
   LazyLoadTexture search_spin_texture_;
 
@@ -240,8 +242,9 @@
   , dash_top_tile_("/dash_top_tile.png")
   , dash_shine_("/dash_sheen.png")
   , search_magnify_texture_("/search_magnify.png")
-  , search_close_texture_("/search_close.png")
-  , search_spin_texture_("/search_spin.png")
+  , search_circle_texture_("/search_circle.svg", 32)
+  , search_close_texture_("/search_close.svg", 32)
+  , search_spin_texture_("/search_spin.svg", 32)
   , group_unexpand_texture_("/dash_group_unexpand.png")
   , group_expand_texture_("/dash_group_expand.png")
   , star_deselected_texture_("/star_deselected.png")
@@ -1559,7 +1562,7 @@
               pimpl->button_label_text_color_[state],
               label,
               font_size,
-              10.0,
+              11.0, // 15px = 11pt
               alignment);
 
   return true;
@@ -1814,7 +1817,7 @@
   pimpl->Text(cr,
               pimpl->button_label_text_color_[state],
               label,
-              1.0);
+              10); // 13px = 10pt
 
   return true;
 }
@@ -2105,6 +2108,11 @@
   return pimpl->search_magnify_texture_.texture();
 }
 
+nux::BaseTexture* Style::GetSearchCircleIcon()
+{
+  return pimpl->search_circle_texture_.texture();
+}
+
 nux::BaseTexture* Style::GetSearchCloseIcon()
 {
   return pimpl->search_close_texture_.texture();
@@ -2149,8 +2157,9 @@
 namespace
 {
 
-LazyLoadTexture::LazyLoadTexture(std::string const& filename)
+LazyLoadTexture::LazyLoadTexture(std::string const& filename, int size)
   : filename_(filename)
+  , size_(size)
 {
 }
 
@@ -2167,7 +2176,7 @@
   glib::Object<GdkPixbuf> pixbuf;
   glib::Error error;
 
-  pixbuf = ::gdk_pixbuf_new_from_file(full_path.c_str(), &error);
+  pixbuf = ::gdk_pixbuf_new_from_file_at_size(full_path.c_str(), size_, size_, &error);
   if (error)
   {
     LOG_WARN(logger) << "Unable to texture " << full_path << ": " << error;
 
=== modified file 'plugins/unityshell/src/DashStyle.h'
--- plugins/unityshell/src/DashStyle.h	2012-02-24 15:19:35 +0000
+++ plugins/unityshell/src/DashStyle.h	2012-03-13 16:31:20 +0000
@@ -178,6 +178,7 @@
   nux::BaseTexture* GetDashShine();
 
   nux::BaseTexture* GetSearchMagnifyIcon();
+  nux::BaseTexture* GetSearchCircleIcon();
   nux::BaseTexture* GetSearchCloseIcon();
   nux::BaseTexture* GetSearchSpinIcon();
 
 
=== modified file 'plugins/unityshell/src/FilterExpanderLabel.cpp'
--- plugins/unityshell/src/FilterExpanderLabel.cpp	2012-02-21 01:16:53 +0000
+++ plugins/unityshell/src/FilterExpanderLabel.cpp	2012-03-13 16:31:20 +0000
@@ -47,6 +47,9 @@
 const int HIGHLIGHT_HEIGHT = 34;
 const int HIGHLIGHT_WIDTH_SUBTRACTOR = 5;
 
+// font
+const char* const FONT_EXPANDER_LABEL = "Ubuntu Bold 13"; // 17px = 13
+
 class ExpanderView : public nux::View
 {
 public:
@@ -102,7 +105,7 @@
   , right_hand_contents_(nullptr)
   , cairo_label_(nullptr)
   , raw_label_(label)
-  , label_("<span size='larger' weight='bold'>" + label + "</span>")
+  , label_("label")
 {
   expanded.changed.connect(sigc::mem_fun(this, &FilterExpanderLabel::DoExpandChange));
   BuildLayout();
@@ -118,10 +121,7 @@
 {
   raw_label_ = label;
 
-  label_ = "<span size='larger' weight='bold'>";
-  label_ += raw_label_;
-  label_ += "</span>";
-  cairo_label_->SetText(label_.c_str());
+  cairo_label_->SetText(label.c_str());
 }
 
 void FilterExpanderLabel::SetRightHandView(nux::View* view)
@@ -159,10 +159,10 @@
   expander_view_->SetLayout(expander_layout_);
   top_bar_layout_->AddView(expander_view_, 0);
 
-  cairo_label_ = new nux::StaticText(label_.c_str(), NUX_TRACKER_LOCATION);
-  cairo_label_->SetFontName("Ubuntu 10");
+  cairo_label_ = new nux::StaticCairoText(label_.c_str(), NUX_TRACKER_LOCATION);
+  cairo_label_->SetFont(FONT_EXPANDER_LABEL);
   cairo_label_->SetTextColor(nux::color::White);
-  cairo_label_->SetAcceptKeyNavFocusOnMouseDown(false);
+  cairo_label_->SetAcceptKeyboardEvent(false);
 
   nux::BaseTexture* arrow;
   arrow = dash::Style::Instance().GetGroupUnexpandIcon();
 
=== modified file 'plugins/unityshell/src/FilterExpanderLabel.h'
--- plugins/unityshell/src/FilterExpanderLabel.h	2012-02-21 00:11:20 +0000
+++ plugins/unityshell/src/FilterExpanderLabel.h	2012-03-13 16:31:20 +0000
@@ -30,11 +30,11 @@
 #include <Nux/HLayout.h>
 #include <Nux/View.h>
 #include <Nux/VLayout.h>
-#include <Nux/StaticText.h>
 #include <UnityCore/Filter.h>
 
 #include "IconTexture.h"
 #include "Introspectable.h"
+#include "StaticCairoText.h"
 
 namespace nux
 {
@@ -81,7 +81,7 @@
   nux::View* expander_view_;
   nux::LinearLayout* expander_layout_;
   nux::View* right_hand_contents_;
-  nux::StaticText* cairo_label_;
+  nux::StaticCairoText* cairo_label_;
   std::string raw_label_;
   std::string label_;
   nux::VLayout* arrow_layout_;
 
=== modified file 'plugins/unityshell/src/FilterMultiRangeButton.cpp'
--- plugins/unityshell/src/FilterMultiRangeButton.cpp	2012-02-17 16:48:25 +0000
+++ plugins/unityshell/src/FilterMultiRangeButton.cpp	2012-03-13 16:31:20 +0000
@@ -158,12 +158,10 @@
                                          MultiRangeSide faked_side)
 {
   std::string name("10");
-  std::stringstream final;
 
   if (filter_)
   {
     name = filter_->name;
-    final << "<small>" << name << "</small>";
   }
 
   Arrow arrow;
@@ -184,7 +182,7 @@
   else
     segment = Segment::RIGHT;
 
-  Style::Instance().MultiRangeSegment(cr, faked_state, final.str(), arrow, segment);
+  Style::Instance().MultiRangeSegment(cr, faked_state, name, arrow, segment);
   NeedRedraw();
 }
 
 
=== modified file 'plugins/unityshell/src/PlacesGroup.cpp'
--- plugins/unityshell/src/PlacesGroup.cpp	2012-03-13 07:31:25 +0000
+++ plugins/unityshell/src/PlacesGroup.cpp	2012-03-13 16:31:20 +0000
@@ -50,10 +50,8 @@
 namespace
 {
 
-const nux::Color kExpandDefaultTextColor(1.0f, 1.0f, 1.0f, 1.0f);
-const nux::Color kExpandHoverTextColor(1.0f, 1.0f, 1.0f, 1.0f);
-const float kExpandDefaultIconOpacity = 1.0f;
-const float kExpandHoverIconOpacity = 1.0f;
+const nux::Color kExpandDefaultTextColor(1.0f, 1.0f, 1.0f, 0.5f);
+const float kExpandDefaultIconOpacity = 0.5f;
 
 // Category  highlight
 const int kHighlightHeight = 24;
@@ -64,6 +62,10 @@
 const int kSeparatorLeftPadding = 16;
 const int kSeparatorWidthSubtractor = 10;
 
+// Font
+const char* const NAME_LABEL_FONT = "Ubuntu 13"; // 17px = 13
+const char* const EXPANDER_LABEL_FONT = "Ubuntu 10"; // 13px = 10
+
 class HeaderView : public nux::View
 {
 public:
@@ -142,6 +144,7 @@
   _header_layout->AddLayout(_text_layout, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
 
   _name = new nux::StaticCairoText("", NUX_TRACKER_LOCATION);
+  _name->SetFont(NAME_LABEL_FONT);
   _name->SetTextEllipsize(nux::StaticCairoText::NUX_ELLIPSIZE_END);
   _name->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_LEFT);
   _text_layout->AddView(_name, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
@@ -150,12 +153,15 @@
   _expand_layout->SetHorizontalInternalMargin(8);
   _text_layout->AddLayout(_expand_layout, 0, nux::MINOR_POSITION_END, nux::MINOR_SIZE_MATCHCONTENT);
 
+  _expand_label_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
+  _expand_layout->AddLayout(_expand_label_layout, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
+
   _expand_label = new nux::StaticCairoText("", NUX_TRACKER_LOCATION);
+  _expand_label->SetFont(EXPANDER_LABEL_FONT);
   _expand_label->SetTextEllipsize(nux::StaticCairoText::NUX_ELLIPSIZE_END);
   _expand_label->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_LEFT);
   _expand_label->SetTextColor(kExpandDefaultTextColor);
-
-  _expand_layout->AddView(_expand_label, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
+  _expand_label_layout->AddView(_expand_label, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
   _expand_icon = new IconTexture(arrow, arrow->GetWidth(), arrow->GetHeight());
   _expand_icon->SetOpacity(kExpandDefaultIconOpacity);
@@ -278,9 +284,7 @@
 void
 PlacesGroup::RefreshLabel()
 {
-  const char* temp = "<span size='small'>%s</span>";
   char*       result_string;
-  char*       final;
 
   if (_n_visible_items_in_unexpand_mode >= _n_total_items)
   {
@@ -305,9 +309,8 @@
   SetName(tmpname);
   g_free(tmpname);
 
-  final = g_strdup_printf(temp, result_string);
 
-  _expand_label->SetText(final);
+  _expand_label->SetText(result_string);
   _expand_label->SetVisible(_n_visible_items_in_unexpand_mode < _n_total_items);
 
   // See bug #748101 ("Dash - "See more..." line should be base-aligned with section header")
@@ -317,12 +320,11 @@
   int bottom_padding = _name->GetBaseHeight() - _name->GetBaseline() -
                        (_expand_label->GetBaseHeight() - _expand_label->GetBaseline());
 
-  _expand_layout->SetTopAndBottomPadding(0, bottom_padding);
+  _expand_label_layout->SetTopAndBottomPadding(0, bottom_padding);
 
   QueueDraw();
 
-  g_free((result_string));
-  g_free(final);
+  g_free(result_string);
 }
 
 void
 
=== modified file 'plugins/unityshell/src/PlacesGroup.h'
--- plugins/unityshell/src/PlacesGroup.h	2012-03-09 21:36:35 +0000
+++ plugins/unityshell/src/PlacesGroup.h	2012-03-13 16:31:20 +0000
@@ -105,6 +105,7 @@
   nux::View* _header_view;
   nux::HLayout* _header_layout;
   nux::HLayout* _text_layout;
+  nux::HLayout* _expand_label_layout;
   nux::HLayout* _expand_layout;
   nux::View*  _child_view;
   nux::AbstractPaintLayer* _focus_layer;
 
=== modified file 'plugins/unityshell/src/ResultRendererTile.cpp'
--- plugins/unityshell/src/ResultRendererTile.cpp	2011-10-03 23:21:55 +0000
+++ plugins/unityshell/src/ResultRendererTile.cpp	2012-03-13 16:31:20 +0000
@@ -51,6 +51,9 @@
 namespace
 {
 nux::logging::Logger logger("unity.dash.results");
+
+const int FONT_SIZE = 10;
+
 }
 
 namespace dash
@@ -423,7 +426,7 @@
   cairo_set_font_options(cr, gdk_screen_get_font_options(screen));
   layout = pango_cairo_create_layout(cr);
   desc = pango_font_description_from_string(font.Value());
-  pango_font_description_set_size (desc, 9 * PANGO_SCALE);
+  pango_font_description_set_size (desc, FONT_SIZE * PANGO_SCALE);
 
   pango_layout_set_font_description(layout, desc);
   pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
 
=== modified file 'plugins/unityshell/src/SearchBar.cpp'
--- plugins/unityshell/src/SearchBar.cpp	2012-02-23 21:48:26 +0000
+++ plugins/unityshell/src/SearchBar.cpp	2012-03-13 16:31:20 +0000
@@ -51,11 +51,29 @@
 const int LIVE_SEARCH_TIMEOUT = 40;
 const int SPINNER_TIMEOUT = 100;
 
+const int SPINNER_HEIGHT = 48; // To don't break the current layout, let's use a fixed height for the spinner.
+const int SPACE_BETWEEN_SPINNER_AND_TEXT = 4;
+const int LEFT_INTERNAL_PADDING = 9;
+
+
 // Highlight
 const int HIGHLIGHT_HEIGHT = 24;
 const int HIGHLIGHT_WIDTH = 292;
 const int HIGHLIGHT_LEFT_PADDING = 5;
 const int HIGHLIGHT_RIGHT_PADDING = 4;
+
+// Fonts
+const std::string HINT_LABEL_FONT_SIZE = "20px";
+const std::string HINT_LABEL_FONT_STYLE = "Italic";
+const std::string HINT_LABEL_DEFAULT_FONT = "Ubuntu " + HINT_LABEL_FONT_STYLE + " " + HINT_LABEL_FONT_SIZE;
+
+const std::string PANGO_ENTRY_DEFAULT_FONT_FAMILY = "Ubuntu";
+const int PANGO_ENTRY_FONT_SIZE = 22;
+
+const std::string SHOW_FILTERS_LABEL_FONT_SIZE = "13";
+const std::string SHOW_FILTERS_LABEL_FONT_STYLE = "Bold";
+const std::string SHOW_FILTERS_LABEL_DEFAULT_FONT = "Ubuntu " + SHOW_FILTERS_LABEL_FONT_STYLE + " " + SHOW_FILTERS_LABEL_FONT_SIZE;
+
 }
 
 namespace
@@ -160,21 +178,28 @@
   bg_layer_ = new nux::ColorLayer(nux::Color(0xff595853), true);
 
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
-  layout_->SetHorizontalInternalMargin(0);
-  layout_->SetVerticalExternalMargin(external_margin_vertical);
-  layout_->SetHorizontalExternalMargin(external_margin_horizontal);
+  layout_->SetHorizontalInternalMargin(SPACE_BETWEEN_SPINNER_AND_TEXT);
+  layout_->SetTopAndBottomPadding(external_margin_vertical);
+  layout_->SetLeftAndRightPadding(external_margin_horizontal + LEFT_INTERNAL_PADDING, external_margin_horizontal);
   SetLayout(layout_);
 
   spinner_ = new SearchBarSpinner();
-  spinner_->SetMinMaxSize(icon->GetWidth(), icon->GetHeight());
+  spinner_->SetMinimumHeight(SPINNER_HEIGHT);
+  spinner_->SetMaximumHeight(SPINNER_HEIGHT);
   spinner_->mouse_click.connect(sigc::mem_fun(this, &SearchBar::OnClearClicked));
   layout_->AddView(spinner_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
+  nux::HLayout* hint_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
+
   hint_ = new nux::StaticCairoText(" ");
   hint_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 0.5f));
   hint_->SetMaximumWidth(search_bar_width_ - icon->GetWidth());
+  hint_->SetFont(HINT_LABEL_DEFAULT_FONT.c_str());
+  hint_layout->AddView(hint_,  0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
   pango_entry_ = new IMTextEntry();
+  pango_entry_->SetFontFamily(PANGO_ENTRY_DEFAULT_FONT_FAMILY.c_str());
+  pango_entry_->SetFontSize(PANGO_ENTRY_FONT_SIZE);
   pango_entry_->text_changed.connect(sigc::mem_fun(this, &SearchBar::OnSearchChanged));
   pango_entry_->activated.connect([&]() { activated.emit(); });
   pango_entry_->cursor_moved.connect([&](int i) { QueueDraw(); });
@@ -183,7 +208,7 @@
   pango_entry_->SetMaximumWidth(search_bar_width_ - 1.5 * icon->GetWidth());
 
   layered_layout_ = new nux::LayeredLayout();
-  layered_layout_->AddLayer(hint_);
+  layered_layout_->AddLayout(hint_layout);
   layered_layout_->AddLayer(pango_entry_);
   layered_layout_->SetPaintAll(true);
   layered_layout_->SetActiveLayerN(1);
@@ -193,11 +218,11 @@
 
   if (show_filter_hint_)
   {
-    std::string filter_str(_("<small><b>Filter results</b></small>"));
+    std::string filter_str(_("Filter results"));
     show_filters_ = new nux::StaticCairoText(filter_str.c_str());
     show_filters_->SetVisible(false);
-    show_filters_->SetFont("Ubuntu 10");
-    show_filters_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
+    show_filters_->SetFont(SHOW_FILTERS_LABEL_DEFAULT_FONT.c_str());
+    show_filters_->SetTextColor(nux::color::White);
     show_filters_->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_LEFT);
 
     nux::BaseTexture* arrow;
@@ -298,44 +323,35 @@
 
 void SearchBar::OnFontChanged(GtkSettings* settings, GParamSpec* pspec)
 {
-  static const int HOW_LARGE = 8;
   gchar* font_name = NULL;
   PangoFontDescription* desc;
-  gint size;
-  gchar* font_desc;
+  std::ostringstream font_desc;
 
   g_object_get(settings, "gtk-font-name", &font_name, NULL);
 
   desc = pango_font_description_from_string(font_name);
   pango_entry_->SetFontFamily(pango_font_description_get_family(desc));
-
-  size = pango_font_description_get_size(desc);
-  size /= pango_font_description_get_size_is_absolute(desc) ? 1 : PANGO_SCALE;
-  pango_entry_->SetFontSize(size + HOW_LARGE);
-
+  pango_entry_->SetFontSize(PANGO_ENTRY_FONT_SIZE);
   pango_entry_->SetFontOptions(gdk_screen_get_font_options(gdk_screen_get_default()));
 
-  font_desc = g_strdup_printf("%s %d", pango_font_description_get_family(desc), size + HOW_LARGE);
-  hint_->SetFont(font_desc);
+  font_desc << pango_font_description_get_family(desc) << " " << HINT_LABEL_FONT_STYLE << " " << HINT_LABEL_FONT_SIZE;
+  hint_->SetFont(font_desc.str().c_str());
 
-  g_free(font_desc);
-  font_desc = g_strdup_printf("%s %d", pango_font_description_get_family(desc), size + HOW_LARGE/2);
-  show_filters_->SetFont(font_desc);
+  font_desc.str("");
+  font_desc.clear();
+  font_desc << pango_font_description_get_family(desc) << " " << SHOW_FILTERS_LABEL_FONT_STYLE << " " << SHOW_FILTERS_LABEL_FONT_SIZE;
+  show_filters_->SetFont(font_desc.str().c_str());
 
   pango_font_description_free(desc);
   g_free(font_name);
-  g_free(font_desc);
 }
 
 void SearchBar::OnSearchHintChanged()
 {
-  std::string hint = search_hint;
-  gchar* tmp = g_markup_escape_text(hint.c_str(), -1);
-
-  gchar* markup  = g_strdup_printf("<span font_size='small' font_style='italic'> %s </span>", tmp);
-  hint_->SetText(markup);
-
-  g_free(markup);
+  gchar* tmp = g_markup_escape_text(search_hint().c_str(), -1);
+
+  hint_->SetText(tmp);
+
   g_free(tmp);
 }
 
@@ -583,14 +599,15 @@
 
 void SearchBar::OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key)
 {
-  search_hint = "";
+  hint_->SetVisible(false);
 }
 
 void SearchBar::OnEndKeyFocus()
 {
-  search_hint = _("Search");
+  hint_->SetVisible(search_string().empty());
 }
 
+
 nux::TextEntry* SearchBar::text_entry() const
 {
   return pango_entry_;
 
=== modified file 'plugins/unityshell/src/SearchBarSpinner.cpp'
--- plugins/unityshell/src/SearchBarSpinner.cpp	2012-03-01 01:47:18 +0000
+++ plugins/unityshell/src/SearchBarSpinner.cpp	2012-03-13 16:31:20 +0000
@@ -39,6 +39,7 @@
   dash::Style& style = dash::Style::Instance();
 
   _magnify = style.GetSearchMagnifyIcon();
+  _circle = style.GetSearchCircleIcon();
   _close = style.GetSearchCloseIcon();
   _spin = style.GetSearchSpinIcon();
 
@@ -112,24 +113,13 @@
   }
   else
   {
-    texxform.FlipVCoord(true);
-    GfxContext.QRP_1Tex(geo.x + ((geo.width - _spin->GetWidth()) / 2),
-                        geo.y + ((geo.height - _spin->GetHeight()) / 2),
-                        _spin->GetWidth(),
-                        _spin->GetHeight(),
-                        _spin->GetDeviceTexture(),
-                        texxform,
-                        nux::color::White);
-    texxform.FlipVCoord(false);
-
-    GfxContext.QRP_1Tex(geo.x + ((geo.width - _spin->GetWidth()) / 2),
-                        geo.y + ((geo.height - _spin->GetHeight()) / 2),
-                        _spin->GetWidth(),
-                        _spin->GetHeight(),
-                        _spin->GetDeviceTexture(),
-                        texxform,
-                        nux::color::White);
-
+    GfxContext.QRP_1Tex(geo.x + ((geo.width - _circle->GetWidth()) / 2),
+                        geo.y + ((geo.height - _circle->GetHeight()) / 2),
+                        _circle->GetWidth(),
+                        _circle->GetHeight(),
+                        _circle->GetDeviceTexture(),
+                        texxform,
+                        nux::color::White);
 
     GfxContext.QRP_1Tex(geo.x + ((geo.width - _close->GetWidth()) / 2),
                         geo.y + ((geo.height - _close->GetHeight()) / 2),
 
=== modified file 'plugins/unityshell/src/SearchBarSpinner.h'
--- plugins/unityshell/src/SearchBarSpinner.h	2012-02-07 07:42:12 +0000
+++ plugins/unityshell/src/SearchBarSpinner.h	2012-03-13 16:31:20 +0000
@@ -65,10 +65,9 @@
   SpinnerState      _state;
 
   nux::BaseTexture* _magnify;
+  nux::BaseTexture* _circle;
   nux::BaseTexture* _close;
-  nux::BaseTexture* _close_glow;
   nux::BaseTexture* _spin;
-  nux::BaseTexture* _spin_glow;
 
   nux::Matrix4 _2d_rotate;
   float        _rotation;
 
=== modified file 'plugins/unityshell/src/StaticCairoText.cpp'
--- plugins/unityshell/src/StaticCairoText.cpp	2012-02-29 09:59:09 +0000
+++ plugins/unityshell/src/StaticCairoText.cpp	2012-03-13 16:31:20 +0000
@@ -308,6 +308,7 @@
   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
@@ -370,9 +371,14 @@
                                        (float) dpi / (float) PANGO_SCALE);
   }
   pango_layout_context_changed(layout);
-  pango_layout_get_extents(layout, NULL, &logRect);
-
-  width  = logRect.width / PANGO_SCALE;
+  pango_layout_get_extents(layout, &inkRect, &logRect);
+
+  // logRect has some issues using italic style
+  if (inkRect.x + inkRect.width > logRect.x + logRect.width)
+    width = (inkRect.x + inkRect.width - logRect.x) /PANGO_SCALE;
+  else
+    width  = logRect.width / PANGO_SCALE;
+
   height = logRect.height / PANGO_SCALE;
   _cached_extent_height = height;
   _cached_extent_width = width;