Merge lp:~mterry/unity-greeter/center-names into lp:unity-greeter

[Michael Terry]

This fixes some spacing and alignment issues around the names and option button.

=== modified file 'src/greeter-list.vala'
--- src/greeter-list.vala	2012-09-28 19:22:56 +0000
+++ src/greeter-list.vala	2012-12-12 21:00:36 +0000
@@ -436,28 +436,19 @@
 
     protected virtual int get_position_y (double position)
     {
-        // Most position heights are just the grid height.  Except for the one
-        // right above the greeter box and the greeter box itself.  The greeter
-        // box is some number of grids to start with.  And it is smaller by a
-        // bit, while the one above it is larger by the same amount, in order
-        // to line up names outside the greeter box in the middle of their
-        // grid, while the name inside the box is near the bottom of its first
-        // box.
-        int one_above_height = grid_size + PromptBox.NAME_MARGIN_TOP;
-        int box_height = get_greeter_box_height_grids () * grid_size -
-                         PromptBox.NAME_MARGIN_TOP;
+        // Most position heights are just the grid height.  Except for the
+        // greeter box itself.
+        int box_height = get_greeter_box_height_grids () * grid_size;
         double offset;
 
-        if (position < -1)
-            offset = (position + 1) * grid_size - one_above_height;
-        else if (position < 0)
-            offset = position * one_above_height;
+        if (position < 0)
+            offset = position * grid_size;
         else if (position < 1)
             offset = position * box_height;
         else
             offset = (position - 1) * grid_size + box_height;
 
-        return get_greeter_box_y () + (int)Math.round(offset);
+        return box_y + (int)Math.round(offset);
     }
 
     private void move_entry (PromptBox entry, double position)
 
=== modified file 'src/prompt-box.vala'
--- src/prompt-box.vala	2012-12-06 21:06:54 +0000
+++ src/prompt-box.vala	2012-12-12 21:00:36 +0000
@@ -20,8 +20,6 @@
 
 public class PromptBox : FadableBox
 {
-    public static const int NAME_MARGIN_TOP = 12;
-
     public signal void respond (string[] response);
     public signal void login ();
     public signal void show_options ();
@@ -45,8 +43,6 @@
     private Gtk.Fixed fixed;
     private Gtk.Widget zone; /* when overlapping zone we are fully expanded */
 
-    private int name_grid_height = grid_size - NAME_MARGIN_TOP;
-
     /* Expanded widgets */
     protected Gtk.Grid box_grid;
     protected Gtk.Grid name_grid;
@@ -101,13 +97,11 @@
         fixed.show ();
         add (fixed);
 
-        /* Create fully expanded version of ourselves */
-        name_grid = create_name_grid ();
-
         box_grid = new Gtk.Grid ();
         box_grid.column_spacing = 4;
         box_grid.row_spacing = 3;
-        box_grid.margin_bottom = 10;
+        box_grid.margin_top = GreeterList.BORDER;
+        box_grid.margin_bottom = 6;
         box_grid.expand = true;
 
         /** Grid layout:
@@ -119,7 +113,7 @@
 
         active_indicator = new ActiveIndicator ();
         active_indicator.valign = Gtk.Align.START;
-        active_indicator.margin_top = 11 + NAME_MARGIN_TOP;
+        active_indicator.margin_top = (grid_size - active_indicator.pixbuf.get_height ()) / 2;
         active_indicator.show ();
         box_grid.attach (active_indicator, COL_ACTIVE, last_row, 1, 1);
 
@@ -129,6 +123,9 @@
         box_grid.attach (dummy_indicator, COL_SPACER, last_row, 1, 1);
 
         box_grid.show ();
+
+        /* Create fully expanded version of ourselves */
+        name_grid = create_name_grid ();
         box_grid.attach (name_grid, COL_CONTENT, last_row, 1, 1);
 
         /* Now prep small versions of the above normal widgets.  These are
@@ -140,8 +137,8 @@
         small_box_grid.show ();
 
         small_active_indicator = new ActiveIndicator ();
-        small_active_indicator.valign = Gtk.Align.CENTER;
-        small_active_indicator.margin_top = NAME_MARGIN_TOP;
+        small_active_indicator.valign = Gtk.Align.START;
+        small_active_indicator.margin_top = (grid_size - small_active_indicator.pixbuf.get_height ()) / 2;
         small_active_indicator.show ();
         small_box_grid.attach (small_active_indicator, 0, 0, 1, 1);
 
@@ -177,11 +174,12 @@
         name_label = new FadingLabel ("");
         name_label.override_font (Pango.FontDescription.from_string ("Ubuntu 13"));
         name_label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f });
-        name_label.margin_top = NAME_MARGIN_TOP;
         name_label.valign = Gtk.Align.START;
         name_label.vexpand = true;
+        name_label.yalign = 0.5f;
         name_label.xalign = 0.0f;
-        name_label.set_size_request (-1, name_grid_height);
+        name_label.margin_left = 2;
+        name_label.set_size_request (-1, grid_size);
         name_label.show ();
         name_grid.attach (name_label, COL_NAME_LABEL, ROW_NAME, 1, 1);
 
@@ -197,8 +195,7 @@
 
         var align = new Gtk.Alignment (0.5f, 0.5f, 0.0f, 0.0f);
         align.valign = Gtk.Align.START;
-        align.margin_top = NAME_MARGIN_TOP;
-        align.set_size_request (-1, name_grid_height);
+        align.set_size_request (-1, grid_size);
         align.add (message_image);
         align.show ();
         name_grid.attach (align, COL_NAME_MESSAGE, ROW_NAME, 1, 1);
@@ -207,7 +204,8 @@
         option_button.hexpand = true;
         option_button.halign = Gtk.Align.END;
         option_button.valign = Gtk.Align.START;
-        option_button.margin_top = NAME_MARGIN_TOP;
+        // Keep as much space on top as on the right
+        option_button.margin_top = active_indicator.pixbuf.get_width () + box_grid.column_spacing;
         option_button.focus_on_click = false;
         option_button.relief = Gtk.ReliefStyle.NONE;
         option_button.get_accessible ().set_name (_("Session Options"));
@@ -240,9 +238,10 @@
         small_name_label = new FadingLabel ("");
         small_name_label.override_font (Pango.FontDescription.from_string ("Ubuntu 13"));
         small_name_label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f });
-        small_name_label.margin_top = NAME_MARGIN_TOP;
+        small_name_label.yalign = 0.5f;
         small_name_label.xalign = 0.0f;
-        small_name_label.set_size_request (-1, name_grid_height);
+        small_name_label.margin_left = 2;
+        small_name_label.set_size_request (-1, grid_size);
         small_name_label.show ();
         small_name_grid.attach (small_name_label, 1, 0, 1, 1);
 
@@ -250,8 +249,7 @@
         small_message_image.pixbuf = message_image.pixbuf;
 
         var align = new Gtk.Alignment (0.5f, 0.5f, 0.0f, 0.0f);
-        align.margin_top = NAME_MARGIN_TOP;
-        align.set_size_request (-1, name_grid_height);
+        align.set_size_request (-1, grid_size);
         align.add (small_message_image);
         align.show ();
         small_name_grid.attach (align, 2, 0, 1, 1);
@@ -639,23 +637,18 @@
             debug ("Could not load active image: %s", e.message);
         }
         notify["active"].connect (() => { queue_draw (); });
+        xalign = 0.0f;
     }
 
     public override void get_preferred_width (out int min, out int nat)
     {
-        if (pixbuf != null)
-            min = pixbuf.get_width ();
-        else
-            min = 0;
+        min = 8;
         nat = min;
     }
 
     public override void get_preferred_height (out int min, out int nat)
     {
-        if (pixbuf != null)
-            min = pixbuf.get_height ();
-        else
-            min = 0;
+        min = 7;
         nat = min;
     }