Merge lp:~mterry/unity-greeter/designfixups into lp:unity-greeter

[Michael Terry]

John Lea asked for some Unity Greeter changes:

1) Bring name labels down a bit to be vertically centered with the session chooser button on the right
2) Make password entries and the login button you get for guest accounts the same vertical size
3) Add a pixel or two separation between password characters and the cursor (right now, they appear to abut)

I don't believe these are big enough changes to warrant a UI Freeze exception.

[Ken VanDine (ken-vandine)]

Looks fine to me, I think the only thing that I worry about needing a UIFe for is the font size change. But realistically going from 14 to 16 will probably not be noticeable in screenshots.

review: Approve

=== modified file 'src/dash-button.vala'
--- src/dash-button.vala	2012-03-13 14:00:28 +0000
+++ src/dash-button.vala	2012-04-04 20:01:25 +0000
@@ -29,7 +29,7 @@
         set
         {
             _text = value;
-            text_label.set_markup ("<span font_size=\"large\">%s</span>".printf (value));
+            text_label.set_markup ("<span font=\"Ubuntu 16\">%s</span>".printf (value));
         }
     }
 
@@ -59,6 +59,7 @@
         {
             var pixbuf = new Gdk.Pixbuf.from_file (path);
             var image = new CachedImage (pixbuf);
+            image.valign = Gtk.Align.CENTER;
             sizes.add_widget (image);
             hbox.add (image);
         }
@@ -69,6 +70,17 @@
 
         hbox.show_all ();
         add (hbox);
+
+        try
+        {
+            var style = new Gtk.CssProvider ();
+            style.load_from_data ("* {padding: 3px;}", -1);
+            this.get_style_context ().add_provider (style, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        }
+        catch (Error e)
+        {
+            debug ("Internal error loading session chooser style: %s", e.message);
+        }
     }
 
     public override bool draw (Cairo.Context c)

=== modified file 'src/dash-entry.vala'
--- src/dash-entry.vala	2012-03-08 03:26:49 +0000
+++ src/dash-entry.vala	2012-04-04 20:01:25 +0000
@@ -35,6 +35,8 @@
 
         changed.connect (changed_cb);
         icon_press.connect (icon_press_cb);
+
+        override_font (Pango.FontDescription.from_string ("Ubuntu 14"));
     }
 
     public override bool draw (Cairo.Context c)
@@ -69,7 +71,7 @@
 
         /* Draw text */
         var layout = create_pango_layout (constant_placeholder_text);
-        layout.set_font_description (Pango.FontDescription.from_string ("Ubuntu 14"));
+        layout.set_font_description (Pango.FontDescription.from_string ("Ubuntu 16"));
         Pango.cairo_show_layout (c, layout);
     }
 

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-03-27 19:31:17 +0000
+++ src/user-list.vala	2012-04-04 20:01:25 +0000
@@ -819,10 +819,11 @@
 
         /* Put prompt entry and login button inside login box */
         child_allocation.x = allocation.x + box_x + grid_size / 2;
-        child_allocation.y = allocation.y + box_y + grid_size * 2 - grid_size / 2;
+        child_allocation.y = allocation.y + box_y + grid_size * 2 - grid_size / 4;
         child_allocation.width = grid_size * (box_width - 1);
-        child_allocation.height = grid_size;
+        prompt_entry.get_preferred_height (null, out child_allocation.height);
         prompt_entry.size_allocate (child_allocation);
+        login_button.get_preferred_height (null, out child_allocation.height);
         login_button.size_allocate (child_allocation);
 
         child_allocation.x = allocation.x + box_x + box_width * grid_size - grid_size - grid_size / 4;
@@ -894,7 +895,7 @@
         entry.layout.get_pixel_size (out w, out h);
 
         var label_x = grid_size / 2;
-        var label_y = (grid_size - h) / 2 + border;
+        var label_y = grid_size / 4 + border;
         var label_surface = entry_ensure_label_surface (entry, c, in_box);
         c.set_source_surface (label_surface, label_x, label_y);
         c.paint_with_alpha (alpha);
@@ -1077,7 +1078,7 @@
                 int w, h;
                 m.layout.get_pixel_size (out w, out h);
 
-                c.move_to (grid_size / 2, grid_size * 1.25 - vertical_offset + border);
+                c.move_to (grid_size / 2, grid_size * 1.5 - vertical_offset + border);
                 vertical_offset -= h;
 
                 var r = 1.0;