Merge lp:~cimi/unity/fix-cairo-misalignments into lp:unity

[Neil J. Patel]

Cimi's work

[Mirco Müller (macslow)]

Approved.

review: Approve

=== modified file 'unity-private/places/places-button.vala'
--- unity-private/places/places-button.vala	2010-09-02 23:52:53 +0000
+++ unity-private/places/places-button.vala	2010-09-20 09:41:09 +0000
@@ -136,15 +136,14 @@
       cr.paint ();
 
       cr.set_operator (Cairo.Operator.OVER);
-      cr.set_line_width (1.5);
-      cr.translate (0.5, 0.5);
+      cr.set_line_width (1.0);
 
       if (state == Ctk.ActorState.STATE_NORMAL)
         {
           if (_normal_state == NormalState.UNDERLINE)
             {
-              cr.move_to (x, height - 1);
-              cr.line_to (x + width, height - 1);
+              cr.move_to (x + 3, height - 1.5);
+              cr.line_to (x + width - 4, height - 1.5);
               cr.set_source_rgba (1.0, 1.0, 1.0, 0.3);
               cr.stroke ();
             }
@@ -153,18 +152,18 @@
       else if (state == Ctk.ActorState.STATE_PRELIGHT &&
                _prelight_state == PrelightState.UNDERLINE)
         {
-          cr.move_to (x, height - 1);
-          cr.line_to (x + width, height - 1);
+          cr.move_to (x + 3, height - 1.5);
+          cr.line_to (x + width - 4, height - 1.5);
           cr.set_source_rgba (1.0, 1.0, 1.0, 0.3);
           cr.stroke ();
           return;
         }
 
-      outline_func (cr, width, height);
+      outline_func (cr, width+1, height+1);
 
       if (state == Ctk.ActorState.STATE_NORMAL)
         {
-         cr.set_source_rgba (1.0, 1.0, 1.0, 0.0);
+
         }
       else if (state == Ctk.ActorState.STATE_PRELIGHT)
         {
@@ -173,12 +172,15 @@
                                                4, 4);
           var context = new Cairo.Context (pattern);
           
+          cr.set_source_rgba (1.0, 1.0, 1.0, 0.1);
+          cr.fill_preserve ();
+      
           context.set_operator (Cairo.Operator.CLEAR);
           context.paint ();
 
           context.set_line_width (0.2);
           context.set_operator (Cairo.Operator.OVER);
-          context.set_source_rgba (1.0, 1.0, 1.0, 0.85);
+          context.set_source_rgba (1.0, 1.0, 1.0, 0.4);
 
           context.move_to (0, 0);
           context.line_to (4, 4);
@@ -188,12 +190,19 @@
           var pat = new Cairo.Pattern.for_surface (pattern);
           pat.set_extend (Cairo.Extend.REPEAT);
           cr.set_source (pat);
+
+          cr.fill ();
         }
       else
         {
-          cr.set_source_rgba (1.0, 1.0, 1.0, 1.0);
+         cr.set_source_rgba (1.0, 1.0, 1.0, 1.0);
+
+         cr.fill ();
         }
-      cr.fill_preserve ();
+
+      cr.translate (0.5, 0.5);
+
+      outline_func (cr, width, height);
 
       cr.set_source_rgba (1.0, 1.0, 1.0, 0.5);
       cr.stroke ();
 
=== modified file 'unity-private/places/places-default-renderer.vala'
--- unity-private/places/places-default-renderer.vala	2010-09-14 08:50:05 +0000
+++ unity-private/places/places-default-renderer.vala	2010-09-20 09:41:09 +0000
@@ -162,11 +162,14 @@
         }
       else if (slider_state == SLIDER_STATE_PRELIGHT)
         {
+          cr.set_source_rgba (1.0f, 1.0f, 1.0f, 0.1f);
+          cr.fill_preserve ();
+
           cr_stripes.set_operator (Cairo.Operator.CLEAR);
           cr_stripes.paint ();
           cr_stripes.scale (1.0f, 1.0f);
           cr_stripes.set_operator (Cairo.Operator.OVER);
-          cr_stripes.set_source_rgba (1.0f, 1.0f, 1.0f, 0.25f);
+          cr_stripes.set_source_rgba (1.0f, 1.0f, 1.0f, 0.15f);
           cr_stripes.rectangle (0.0f, 0.0f, 1.0f, 1.0f);
           cr_stripes.fill ();
           cr_stripes.rectangle (1.0f, 1.0f, 1.0f, 1.0f);
@@ -609,8 +612,7 @@
       cr.paint ();
 
       cr.set_operator (Cairo.Operator.OVER);
-      cr.translate (0.5, 0.5);
-      cr.set_line_width (1.5);
+      cr.set_line_width (1.0);
 
       var radius = 7;
       float twidth, theight;
@@ -641,7 +643,27 @@
       cr.close_path ();
 
       cr.set_source_rgba (1.0f, 1.0f, 1.0f, 0.1f);
-      cr.fill_preserve ();
+      cr.fill ();
+
+      cr.translate (0.5, 0.5);
+
+      cr.move_to (x, y + radius);
+      cr.curve_to (x, y,
+                   x, y,
+                   x + radius, y);
+      cr.line_to (x + w - radius, y);
+      cr.curve_to (x + w, y,
+                   x + w, y,
+                   x + w, y + radius);
+      cr.line_to (x + w, y + h - radius);
+      cr.curve_to (x + w, y + h,
+                   x + w, y + h,
+                   x + w - radius, y + h);
+      cr.line_to (x + radius, y + h);
+      cr.curve_to (x, y + h,
+                   x, y + h,
+                   x, y + h - radius);
+      cr.close_path ();
 
       cr.set_source_rgba (1.0f, 1.0f, 1.0f, 0.5f);
       cr.stroke ();
 
=== modified file 'unity-private/places/places-place-search-sections-bar.vala'
--- unity-private/places/places-place-search-sections-bar.vala	2010-09-18 20:56:21 +0000
+++ unity-private/places/places-place-search-sections-bar.vala	2010-09-20 09:41:09 +0000
@@ -522,16 +522,12 @@
       cr.paint ();
 
       cr.set_operator (Cairo.Operator.OVER);
-      cr.set_line_width (1.5);
+      cr.set_line_width (1.0);
       cr.set_source_rgba (1.0, 1.0, 1.0, 0.0);
 
-      cr.translate (0.5, 0.5);
-
       var x = 0;
       var y = 0;
-      width -= 1;
-      height -= 1;
-      var radius = 10;
+      var radius = 7;
 
       if ((get_parent () as PlaceSearchSectionsBar).style == SectionStyle.BUTTONS)
         {
@@ -556,6 +552,8 @@
           if (active || state == Ctk.ActorState.STATE_SELECTED)
             {
               cr.set_source_rgba (1.0, 1.0, 1.0, 1.0);
+
+              cr.fill ();
             }
           else if (state == Ctk.ActorState.STATE_PRELIGHT)
             {
@@ -563,7 +561,10 @@
                                                    Cairo.Content.COLOR_ALPHA,
                                                    4, 4);
               var context = new Cairo.Context (pattern);
-              
+
+              cr.set_source_rgba (1.0, 1.0, 1.0, 0.1);
+              cr.fill_preserve ();
+      
               context.set_operator (Cairo.Operator.CLEAR);
               context.paint ();
 
@@ -579,16 +580,39 @@
               var pat = new Cairo.Pattern.for_surface (pattern);
               pat.set_extend (Cairo.Extend.REPEAT);
               cr.set_source (pat);
+
+              cr.fill ();
             }
           else
             {
-              cr.set_source_rgba (1.0, 1.0, 1.0, 0.0);
+
             }
 
-          cr.fill_preserve ();
+          cr.translate (0.5, 0.5);
+
+          width -= 1;
+          height -= 1;
+
+          cr.move_to  (x, y + radius);
+          cr.curve_to (x, y,
+                       x, y,
+                       x + radius, y);
+          cr.line_to  (width - radius, y);
+          cr.curve_to (width, y,
+                       width, y,
+                       width, y + radius);
+          cr.line_to  (width, height - radius);
+          cr.curve_to (width, height,
+                       width, height,
+                       width - radius, height);
+          cr.line_to  (x + radius, height);
+          cr.curve_to (x, height,
+                       x, height,
+                       x, height - radius);
+          cr.close_path ();
 
           cr.set_source_rgba (1.0, 1.0, 1.0,
-                              state == Ctk.ActorState.STATE_NORMAL ? 0.0 : 0.5);
+                              !active && state == Ctk.ActorState.STATE_NORMAL ? 0.0 : 0.5);
           cr.stroke ();            
         }
       else