Merge lp:~macslow/unity/unity.fix-913717 into lp:unity

[Mirco Müller]

Changed rendering of filling of Dash's search-bar according to design-suggestion... http://people.canonical.com/~mmueller/fix-913717.png

[Andrea Azzarone (azzar1)]

+1

review: Approve

[Andrea Cimitan (cimi)]

Is it using the same values as design? It seems pretty close, difficult to test with different backgrounds and dash background color.
If so, +1 for me

review: Approve

[Andrea Cimitan (cimi)]

Yep, just read the bugreport.

[John Lea (johnlea)]

Looks great, matches visual design, many thanks!

review: Approve (design)

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/115/console reported an error when processing this lp:~macslow/unity/unity.fix-913717 branch.
Not merging it.

=== modified file 'plugins/unityshell/src/DashSearchBar.cpp'
--- plugins/unityshell/src/DashSearchBar.cpp	2012-01-02 19:26:26 +0000
+++ plugins/unityshell/src/DashSearchBar.cpp	2012-01-12 08:53:24 +0000
@@ -319,13 +319,12 @@
   cairo_operator_t op = CAIRO_OPERATOR_OVER;
   op = cairo_get_operator (cr);
   cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-  cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.5f);
+  cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.35f);
   cairo_fill_preserve(cr);
   cairo_set_operator (cr, op);
-  cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.5f);
+  cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.35f);
   cairo_fill_preserve(cr);
   cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 0.8f);
-  //cairo_set_line_width(cr, 1.0);
   cairo_stroke(cr);
 
   cairo_destroy(cr);