Merge lp:~mterry/unity-greeter/q-ui-nits into lp:unity-greeter

[Michael Terry]

This branch implements a set of four UI changes that Design requested for 12.10.

[Michael Terry (mterry)]

Note that this needs UIFe approval first.

[Robert Ancell (robert-ancell)]

Code looks good, approved if gets UIFe.

review: Approve

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-09-07 13:28:19 +0000
+++ data/Makefile.am	2012-09-12 14:45:28 +0000
@@ -14,6 +14,7 @@
 	message.png \
 	recovery_console_badge.png \
 	remote_login_help.png \
+	shadow.png \
 	ubuntu_badge.png \
 	unknown_badge.png
 

=== added file 'data/shadow.png'
Binary files data/shadow.png	1970-01-01 00:00:00 +0000 and data/shadow.png	2012-09-12 14:45:28 +0000 differ
=== modified file 'src/greeter-list.vala'
--- src/greeter-list.vala	2012-09-04 13:35:33 +0000
+++ src/greeter-list.vala	2012-09-12 14:45:28 +0000
@@ -85,11 +85,11 @@
         get
         {
             /* First, get grid row number as if menubar weren't there */
-            var row = (MenuBar.HEIGHT + get_allocated_height ()) / grid_size;
+            var row = (MainWindow.MENUBAR_HEIGHT + get_allocated_height ()) / grid_size;
             row = row - DEFAULT_BOX_HEIGHT; /* and no default dash box */
             row = row / 2; /* and in the middle */
             /* Now calculate y pixel spot keeping in mind menubar's allocation */
-            return row * grid_size - MenuBar.HEIGHT;
+            return row * grid_size - MainWindow.MENUBAR_HEIGHT;
         }
     }
 
@@ -436,20 +436,28 @@
 
     protected virtual int get_position_y (double position)
     {
-        double grid_number = position;
-
-        if (position >= 0.0 && position < 1.0)
-        {
-            var grids = get_greeter_box_height_grids ();
-            grid_number = position * grids; /* scaled to height of greeter box */
-        }
-        else if (position >= 1.0)
-        {
-            var grids = get_greeter_box_height_grids ();
-            grid_number = position + grids - 1.0;
-        }
-
-        return get_greeter_box_y () + (int)(grid_number * grid_size);
+        // 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;
+        double offset;
+
+        if (position < -1)
+            offset = (position + 1) * grid_size - one_above_height;
+        else if (position < 0)
+            offset = position * one_above_height;
+        else if (position < 1)
+            offset = position * box_height;
+        else
+            offset = (position - 1) * grid_size + box_height;
+
+        return get_greeter_box_y () + (int)offset;
     }
 
     private void move_entry (PromptBox entry, double position)

=== modified file 'src/main-window.vala'
--- src/main-window.vala	2012-09-04 09:19:45 +0000
+++ src/main-window.vala	2012-09-12 14:45:28 +0000
@@ -31,6 +31,9 @@
 
     public ListStack stack;
 
+    // Menubar is smaller, but with shadow, we reserve more space
+    public static const int MENUBAR_HEIGHT = 32;
+
     construct
     {
         events |= Gdk.EventMask.POINTER_MOTION_MASK;
@@ -58,9 +61,37 @@
         login_box.show ();
         background.add (login_box);
 
+        /* Box for menubar shadow */
+        var menubox = new Gtk.EventBox ();
+        var menualign = new Gtk.Alignment (0.0f, 0.0f, 1.0f, 0.0f);
+        try
+        {
+            var shadow_path = Path.build_filename (Config.PKGDATADIR,
+                                                   "shadow.png", null);
+            var style = new Gtk.CssProvider ();
+            style.load_from_data ("* {background-color: transparent;
+                                      background-image: url('%s');
+                                      background-repeat: repeat;
+                                     }".printf(shadow_path), -1);
+            var context = menubox.get_style_context ();
+            context.add_provider (style,
+                                  Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        }
+        catch (Error e)
+        {
+            debug ("Internal error loading menubox style: %s", e.message);
+        }
+        menubox.set_size_request (-1, MENUBAR_HEIGHT);
+        menubox.show ();
+        menualign.show ();
+        menubox.add (menualign);
+        login_box.add (menubox);
+        UnityGreeter.add_style_class (menualign);
+        UnityGreeter.add_style_class (menubox);
+
         menubar = new MenuBar (background, accel_group);
         menubar.show ();
-        login_box.add (menubar);
+        menualign.add (menubar);
         UnityGreeter.add_style_class (menubar);
 
         hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
@@ -70,7 +101,7 @@
 
         var align = new Gtk.Alignment (0.5f, 0.5f, 0.0f, 0.0f);
         align.set_size_request (grid_size, -1);
-        align.margin_bottom = MenuBar.HEIGHT; /* offset for menubar at top */
+        align.margin_bottom = MENUBAR_HEIGHT; /* offset for menubar at top */
         align.show ();
         hbox.add (align);
 

=== modified file 'src/menubar.vala'
--- src/menubar.vala	2012-09-04 14:45:06 +0000
+++ src/menubar.vala	2012-09-12 14:45:28 +0000
@@ -65,13 +65,13 @@
 
 public class MenuBar : Gtk.MenuBar
 {
-    public static const int HEIGHT = 32;
     public Background? background { get; construct; default = null; }
     public bool high_contrast { get; private set; default = false; }
     public Gtk.Window? keyboard_window { get; private set; default = null; }
-
     public Gtk.AccelGroup? accel_group { get; construct; }
 
+    private static const int HEIGHT = 24;
+
     public MenuBar (Background bg, Gtk.AccelGroup ag)
     {
         Object (background: bg, accel_group: ag);
@@ -162,12 +162,10 @@
         }
         catch (Error e)
         {
-            debug ("Internal error loading session chooser style: %s", e.message);
+            debug ("Internal error loading menubar style: %s", e.message);
         }
 
         setup_indicators ();
-
-        set_size_request (-1, HEIGHT);
     }
 
     ~MenuBar ()
@@ -181,6 +179,12 @@
         }
     }
 
+    public override void get_preferred_height (out int min, out int nat)
+    {
+        min = HEIGHT;
+        nat = HEIGHT;
+    }
+
     private void greeter_set_env (string key, string val)
     {
         GLib.Environment.set_variable (key, val, true);

=== modified file 'src/prompt-box.vala'
--- src/prompt-box.vala	2012-08-27 23:02:51 +0000
+++ src/prompt-box.vala	2012-09-12 14:45:28 +0000
@@ -20,6 +20,8 @@
 
 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 ();
@@ -43,6 +45,8 @@
     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;
@@ -115,7 +119,7 @@
 
         active_indicator = new ActiveIndicator ();
         active_indicator.valign = Gtk.Align.START;
-        active_indicator.margin_top = 18;
+        active_indicator.margin_top = 12 + NAME_MARGIN_TOP;
         active_indicator.show ();
         box_grid.attach (active_indicator, COL_ACTIVE, last_row, 1, 1);
 
@@ -137,6 +141,7 @@
 
         small_active_indicator = new ActiveIndicator ();
         small_active_indicator.valign = Gtk.Align.CENTER;
+        small_active_indicator.margin_top = NAME_MARGIN_TOP;
         small_active_indicator.show ();
         small_box_grid.attach (small_active_indicator, 0, 0, 1, 1);
 
@@ -172,10 +177,11 @@
         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.xalign = 0.0f;
-        name_label.set_size_request (-1, grid_size);
+        name_label.set_size_request (-1, name_grid_height);
         name_label.show ();
         name_grid.attach (name_label, COL_NAME_LABEL, ROW_NAME, 1, 1);
 
@@ -191,7 +197,8 @@
 
         var align = new Gtk.Alignment (0.5f, 0.5f, 0.0f, 0.0f);
         align.valign = Gtk.Align.START;
-        align.set_size_request (-1, grid_size);
+        align.margin_top = NAME_MARGIN_TOP;
+        align.set_size_request (-1, name_grid_height);
         align.add (message_image);
         align.show ();
         name_grid.attach (align, COL_NAME_MESSAGE, ROW_NAME, 1, 1);
@@ -200,6 +207,7 @@
         option_button.hexpand = true;
         option_button.halign = Gtk.Align.END;
         option_button.valign = Gtk.Align.START;
+        option_button.margin_top = NAME_MARGIN_TOP;
         option_button.focus_on_click = false;
         option_button.relief = Gtk.ReliefStyle.NONE;
         option_button.get_accessible ().set_name (_("Session Options"));
@@ -207,6 +215,16 @@
         option_image = new CachedImage (null);
         option_image.show ();
         UnityGreeter.add_style_class (option_button);
+        try
+        {
+            var style = new Gtk.CssProvider ();
+            style.load_from_data ("* {padding: 2px;}", -1);
+            option_button.get_style_context ().add_provider (style, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        }
+        catch (Error e)
+        {
+            debug ("Internal error loading session chooser style: %s", e.message);
+        }
         option_button.add (option_image);
         name_grid.attach (option_button, COL_NAME_OPTIONS, ROW_NAME, 1, 1);
 
@@ -223,8 +241,9 @@
         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.xalign = 0.0f;
-        small_name_label.set_size_request (-1, grid_size);
+        small_name_label.set_size_request (-1, name_grid_height);
         small_name_label.show ();
         small_name_grid.attach (small_name_label, 1, 0, 1, 1);
 
@@ -232,7 +251,8 @@
         small_message_image.pixbuf = message_image.pixbuf;
 
         var align = new Gtk.Alignment (0.5f, 0.5f, 0.0f, 0.0f);
-        align.set_size_request (-1, grid_size);
+        align.margin_top = NAME_MARGIN_TOP;
+        align.set_size_request (-1, name_grid_height);
         align.add (small_message_image);
         align.show ();
         small_name_grid.attach (align, 2, 0, 1, 1);

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-09-12 14:32:39 +0000
+++ src/user-list.vala	2012-09-12 14:45:28 +0000
@@ -832,11 +832,21 @@
         UnityGreeter.singleton.pop_list ();
     }
 
+    private bool should_show_session_badge ()
+    {
+        if (UnityGreeter.singleton.test_mode)
+            return get_selected_id () != "no-badge";
+        else
+            return LightDM.get_sessions ().length () > 1;
+    }
+
     private Gdk.Pixbuf? get_badge ()
     {
         if (selected_entry is UserPromptBox)
         {
-            if (session == null)
+            if (!should_show_session_badge ())
+                return null;
+            else if (session == null)
                 return SessionList.get_badge (default_session);
             else
                 return SessionList.get_badge (session);
@@ -1022,6 +1032,7 @@
         { "four-layouts",       "Four Layouts",      "*",              "de\tdvorak;ca;gb;fr\toss", false, false, null },
         { "hy-layout",          "Layout Is 'hy'",    "*",              "am\teastern-alt", false, false, null }, /* inherits parent layout's short_desc */
         { "no-response",        "No Response",       "*",              null,    false, false, null },
+        { "no-badge",           "No Badge",          "*",              null,    false, false, null },
         { "",                   "",                  null,             null,    false, false, null }
     };
     private List<string> test_backgrounds;

=== modified file 'tests/test.vala'
--- tests/test.vala	2012-09-07 14:49:10 +0000
+++ tests/test.vala	2012-09-12 14:45:28 +0000
@@ -135,7 +135,7 @@
         // Wait until remote login appears
         scroll_to_remote_login (list);
 
-        GLib.assert (list.num_entries() == 29);
+        GLib.assert (list.num_entries() == 30);
 
         // Make sure we are at the beginning of the list
         do_scroll (list, GreeterList.ScrollTarget.START);