Merge lp:~mterry/unity-greeter/session-chooser into lp:unity-greeter

[Michael Terry]

Here's a branch to implement the design changes for bug 932169. It's not the best of code, but it works. :)

One thing I noticed is that alt-tabbing/keyboard navigation does not seem to work among the UserList controls (including this new session chooser). I don't think that's specific to this branch, and it is something we can fix post-UI-freeze, so I'm going to do that as a separate branch.

Next I'll work on menus from the main menubar looking right. This branch and that one are the last Unity Greeter changes I wanted to push in before Thursday.

[Robert Ancell (robert-ancell)]

Missing src/session-chooser.vala

review: Needs Fixing

[lp:~mterry/unity-greeter/session-chooser]

321. By Michael Terry on 2012-02-22

add missing file

[Michael Terry (mterry)]

Updated with the missing file. Doh!

[Robert Ancell (robert-ancell)]

Nice, works well for me. I wish design would drop the back button as it's completely pointless and ugly but I'll leave that one for them to decide :)

review: Approve

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-02-20 23:12:50 +0000
+++ data/Makefile.am	2012-02-22 04:29:17 +0000
@@ -5,7 +5,8 @@
 
 dist_pkgdata_DATA = \
 	a11y.svg \
-	arrow.png \
+	arrow_left.png \
+	arrow_right.png \
 	cof.png \
 	logo.png \
 	message.png \

=== added file 'data/arrow_left.png'
Binary files data/arrow_left.png	1970-01-01 00:00:00 +0000 and data/arrow_left.png	2012-02-22 04:29:17 +0000 differ
=== renamed file 'data/arrow.png' => 'data/arrow_right.png'
Binary files data/arrow.png	2012-02-16 01:45:32 +0000 and data/arrow_right.png	2012-02-22 04:29:17 +0000 differ
=== added file 'data/gnome_badge.png'
Binary files data/gnome_badge.png	1970-01-01 00:00:00 +0000 and data/gnome_badge.png	2012-02-22 04:29:17 +0000 differ
=== renamed file 'data/gnome_badge.png' => 'data/gnome_badge.png.moved'
=== added file 'data/kde_badge.png'
Binary files data/kde_badge.png	1970-01-01 00:00:00 +0000 and data/kde_badge.png	2012-02-22 04:29:17 +0000 differ
=== renamed file 'data/kde_badge.png' => 'data/kde_badge.png.moved'
=== added file 'data/recovery_console_badge.png'
Binary files data/recovery_console_badge.png	1970-01-01 00:00:00 +0000 and data/recovery_console_badge.png	2012-02-22 04:29:17 +0000 differ
=== renamed file 'data/recovery_console_badge.png' => 'data/recovery_console_badge.png.moved'
=== added file 'data/ubuntu_badge.png'
Binary files data/ubuntu_badge.png	1970-01-01 00:00:00 +0000 and data/ubuntu_badge.png	2012-02-22 04:29:17 +0000 differ
=== renamed file 'data/ubuntu_badge.png' => 'data/ubuntu_badge.png.moved'
=== added file 'data/unknown_badge.png'
Binary files data/unknown_badge.png	1970-01-01 00:00:00 +0000 and data/unknown_badge.png	2012-02-22 04:29:17 +0000 differ
=== renamed file 'data/unknown_badge.png' => 'data/unknown_badge.png.moved'
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-02-15 11:26:39 +0000
+++ src/Makefile.am	2012-02-22 04:29:17 +0000
@@ -12,9 +12,11 @@
 	dash-button.vala \
 	dash-entry.vala \
 	fadable.vala \
+	fadable-box.vala \
 	main-window.vala \
 	menu.vala \
 	menubar.vala \
+	session-chooser.vala \
 	settings.vala \
 	settings-daemon.vala \
 	unity-greeter.vala \

=== modified file 'src/animate-timer.vala'
--- src/animate-timer.vala	2012-01-30 17:49:07 +0000
+++ src/animate-timer.vala	2012-02-22 04:29:17 +0000
@@ -46,6 +46,7 @@
         stop ();
 
         timeout = Timeout.add (16, animate_cb);
+        progress = 0;
         start_time = 0;
         extra_time = 0;
         extra_progress = 0;

=== modified file 'src/dash-button.vala'
--- src/dash-button.vala	2012-02-16 21:31:19 +0000
+++ src/dash-button.vala	2012-02-22 04:29:17 +0000
@@ -47,7 +47,7 @@
         hbox.add (label);
 
         // add chevron
-        var image = new Gtk.Image.from_file (Path.build_filename (Config.PKGDATADIR, "arrow.png", null));
+        var image = new Gtk.Image.from_file (Path.build_filename (Config.PKGDATADIR, "arrow_right.png", null));
         sizes.add_widget (image);
         hbox.add (image);
 

=== modified file 'src/dash-entry.vala'
--- src/dash-entry.vala	2012-02-16 21:31:19 +0000
+++ src/dash-entry.vala	2012-02-22 04:29:17 +0000
@@ -87,7 +87,7 @@
     {
         if (enabled)
         {
-            var file = File.new_for_path (Path.build_filename (Config.PKGDATADIR, "arrow.png", null));
+            var file = File.new_for_path (Path.build_filename (Config.PKGDATADIR, "arrow_right.png", null));
             var icon = new FileIcon (file);
             set_icon_from_gicon (Gtk.EntryIconPosition.SECONDARY, icon);
         }

=== added file 'src/fadable-box.vala'
--- src/fadable-box.vala	1970-01-01 00:00:00 +0000
+++ src/fadable-box.vala	2012-02-22 04:29:17 +0000
@@ -0,0 +1,40 @@
+/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 4 -*-
+ *
+ * Copyright (C) 2011,2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Michael Terry <[e-mail]>
+ */
+
+public class FadableBox : Gtk.Box, Fadable
+{
+    public signal void fade_done ();
+
+    protected FadeTracker fade_tracker {get; protected set;}
+
+    construct
+    {
+        fade_tracker = new FadeTracker (this);
+        fade_tracker.done.connect (() => {fade_done ();});
+    }
+
+    public override bool draw (Cairo.Context c)
+    {
+        c.push_group ();
+        base.draw (c);
+        c.pop_group_to_source ();
+        c.paint_with_alpha (fade_tracker.alpha);
+        return false;
+    }
+}

=== modified file 'src/fadable.vala'
--- src/fadable.vala	2012-01-30 17:40:41 +0000
+++ src/fadable.vala	2012-02-22 04:29:17 +0000
@@ -19,6 +19,8 @@
 
 public class FadeTracker : Object
 {
+    public signal void done ();
+
     public double alpha {get; private set; default = 1.0;}
     public Gtk.Widget widget {get; construct;}
 
@@ -56,13 +58,19 @@
         {
             alpha = progress;
             if (progress == 1.0)
+            {
                 widget.grab_focus ();
+                done ();
+            }
         }
         else
         {
             alpha = 1.0 - progress;
             if (progress == 1.0)
+            {
                 widget.hide (); /* finish the job */
+                done ();
+            }
         }
 
         widget.queue_draw ();

=== added file 'src/session-chooser.vala'
--- src/session-chooser.vala	1970-01-01 00:00:00 +0000
+++ src/session-chooser.vala	2012-02-22 04:29:17 +0000
@@ -0,0 +1,156 @@
+/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 4 -*-
+ *
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Terry <[e-mail]>
+ */
+
+public class SessionChooser : FadableBox
+{
+    public signal void session_clicked (string? session);
+
+    construct
+    {
+        orientation = Gtk.Orientation.VERTICAL;
+        border_width = 6;
+
+        var back = build_back_button ();
+        pack_start (back, false, false, 0);
+
+        if (UnityGreeter.test_mode)
+        {
+            add_session ("gnome", "Ubuntu");
+            add_session ("gnome-shell", "GNOME");
+            add_session ("kde", "KDE");
+        }
+        else
+        {
+            foreach (var session in LightDM.get_sessions ())
+            {
+                debug ("Adding session %s (%s)", session.key, session.name);
+                add_session (session.key, session.name);
+            }
+        }
+    }
+
+    private Gtk.Widget build_back_button ()
+    {
+        var align = new Gtk.Alignment (0.0f, 0.5f, 0.0f, 1.0f);
+
+        var back = new Gtk.Button ();
+        UnityGreeter.add_style_class (back);
+        back.clicked.connect (() => {session_clicked (null);});
+        align.add (back);
+
+        var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+        back.add (hbox);
+
+        var image = new Gtk.Image.from_file (Path.build_filename (Config.PKGDATADIR, "arrow_left.png", null));
+        hbox.pack_start (image, false, false, 0);
+
+        var label = new Gtk.Label.with_mnemonic (_("_Back"));
+        label.mnemonic_widget = back;
+        label.halign = Gtk.Align.START;
+        hbox.pack_start (label, false, false, 0);
+
+        align.show_all ();
+        return align;
+    }
+
+    private void add_session (string key, string name)
+    {
+        var item = new Gtk.Button ();
+        item.clicked.connect (() => {session_clicked (key);});
+        UnityGreeter.add_style_class (item);
+
+        var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+
+        var pixbuf = get_badge (key);
+        if (pixbuf != null)
+        {
+            var image = new Gtk.Image.from_pixbuf (pixbuf);
+            hbox.pack_start (image, false, false, 0);
+        }
+
+        var label = new Gtk.Label (name);
+        label.halign = Gtk.Align.START;
+        hbox.pack_start (label, true, true, 0);
+
+        item.relief = Gtk.ReliefStyle.NONE;
+        item.add (hbox);
+        item.show_all ();
+
+        try
+        {
+            /* Tighten padding on buttons to not be so large */
+            var style = new Gtk.CssProvider ();
+            style.load_from_data ("* {padding: 3px;}", -1);
+            item.get_style_context ().add_provider (style, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        }
+        catch (Error e)
+        {
+            debug ("Internal error loading session chooser style: %s", e.message);
+        }
+
+        add (item);
+    }
+
+    private static string get_badge_name (string session)
+    {
+        switch (session)
+        {
+        case "ubuntu":
+        case "ubuntu-2d":
+        /* NOTE: For legacy reasons 'gnome' is actually Ubuntu */
+        case "gnome":
+            return "ubuntu_badge.png";
+        case "gnome-classic":
+        case "gnome-fallback":
+        case "gnome-shell":
+            return "gnome_badge.png";
+        case "kde":
+            return "kde_badge.png";
+        case "xterm":
+            return "recovery_console_badge.png";
+        default:
+            return "unknown_badge.png";
+        }
+    }
+
+    private static HashTable<string, Gdk.Pixbuf> badges; /* cache of badges */
+    public static Gdk.Pixbuf? get_badge (string session)
+    {
+        var name = get_badge_name (session);
+
+        if (badges == null)
+            badges = new HashTable<string, Gdk.Pixbuf> (str_hash, str_equal);
+
+        var pixbuf = badges.lookup (name);
+        if (pixbuf == null)
+        {
+            try
+            {
+                pixbuf = new Gdk.Pixbuf.from_file (Path.build_filename (Config.PKGDATADIR, name, null));
+                badges.insert (name, pixbuf);
+            }
+            catch (Error e)
+            {
+                debug ("Error loading badge %s: %s", name, e.message);
+            }
+        }
+
+        return pixbuf;
+    }
+}

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-02-21 22:36:02 +0000
+++ src/unity-greeter.vala	2012-02-22 04:29:17 +0000
@@ -48,7 +48,6 @@
 
     private LightDM.Greeter greeter;
     private bool prompted = false;
-    private bool have_session = false;
 
     /* User to authenticate against */
     private string ?authenticate_user = null;
@@ -105,35 +104,30 @@
         main_window = new MainWindow ();
         user_list = main_window.user_list;
 
-        foreach (var session in LightDM.get_sessions ())
-        {
-            debug ("Adding session %s (%s)", session.key, session.name);
-            user_list.add_session (session.key, session.name);
-        }
-
         if (test_mode)
         {
+<<<<<<< TREE
             user_list.add_entry ("alice", "가나다라마", "#dd4814", make_layout_list ("kr"), true);
             user_list.add_entry ("chris", "Christopher Halse Rogers!!!!!!!!!!!!!!!", "/usr/share/backgrounds/Darkening_Clockwork_by_Matt_Katzenberger.jpg", null, true, true);
+=======
+            user_list.add_entry ("alice", "가나다라마", "/usr/share/backgrounds/Darkening_Clockwork_by_Matt_Katzenberger.jpg", make_layout_list ("kr"), true, false, "gnome");
+            user_list.add_entry ("chris", "Christopher Halse Rogers!!!!!!!!!!!!!!!", "/usr/share/backgrounds/Darkening_Clockwork_by_Matt_Katzenberger.jpg", null, true, true, "kde");
+>>>>>>> MERGE-SOURCE
             user_list.add_entry ("jorge", "Jorge O Castro", "/usr/share/backgrounds/PurpleDancers_by_Emilio_Merlino.jpg", make_layout_list ("us"));
             user_list.add_entry ("ken", "Ken VanDine", "/usr/share/backgrounds/Small_flowers_by_Dariusz_Duma.jpg", make_layout_list ("uk;us"));
             user_list.add_entry ("matthew", "Matthew Paul Thomas", "/usr/share/backgrounds/Not_Alone_by_Deacon_MacMillan.jpg", make_layout_list ("gb"), false, true);
             user_list.add_entry ("otto", "Otto Greenslade", "/usr/share/backgrounds/Mount_Snowdon,_Wales_by_Adam_Vellender.jpg", make_layout_list ("gb"));
             user_list.add_entry ("pitti", "Martin Pitt", "/usr/share/backgrounds/Stalking_Ocelot_by_Sayantan_Chaudhuri.jpg", make_layout_list ("de\tdvorak;us"));
-            user_list.add_entry ("desrt", "Ryan Lortie", "/usr/share/backgrounds/Power_of_Words_by_Antonio_Litterio.jpg", make_layout_list ("ca"), false, true);
+            user_list.add_entry ("desrt", "Ryan Lortie", "/usr/share/backgrounds/Power_of_Words_by_Antonio_Litterio.jpg", make_layout_list ("ca"), false, true, "gnome-shell");
             user_list.add_entry ("*guest", _("Guest Session"), null, null, true);
 
-            user_list.add_session ("gnome", "Ubuntu");
-            user_list.add_session ("gnome-shell", "GNOME");
-            user_list.add_session ("kde", "KDE");
-
             if (last_user != null)
                 user_list.set_active_entry (last_user);
         }
         else
         {
             if (greeter.hide_users_hint)
-                user_list.add_entry ("*other", _("Login"), null, null);
+                user_list.add_entry ("*other", _("Login"), null, null, false, false, greeter.default_session_hint);
             else
             {
                 var users = LightDM.UserList.get_instance ();
@@ -147,7 +141,7 @@
             if (greeter.has_guest_account_hint)
             {
                 debug ("Adding guest account entry");
-                user_list.add_entry ("*guest", _("Guest Session"), null, null);
+                user_list.add_entry ("*guest", _("Guest Session"), null, null, false, false, greeter.default_session_hint);
             }
 
             if (greeter.select_user_hint != null)
@@ -220,6 +214,10 @@
         if (user.real_name == "")
             label = user.name;
 
+        var session = user.session;
+        if (session == null)
+            session = greeter.default_session_hint;
+
         var layouts = new List <LightDM.Layout> ();
         foreach (var name in user.get_layouts ())
         {
@@ -228,7 +226,7 @@
                 layouts.append (layout);
         }
 
-        user_list.add_entry (user.name, label, user.background, layouts, user.logged_in, user.has_messages);
+        user_list.add_entry (user.name, label, user.background, layouts, user.logged_in, user.has_messages, session);
     }
 
     private void user_removed_cb (LightDM.User user)
@@ -244,59 +242,13 @@
         main_window.get_window ().focus (Gdk.CURRENT_TIME);
     }
 
-    private void update_session ()
-    {
-        if (have_session)
-            return;
-
-        if (test_mode)
-        {
-            if (test_username == null)
-                return;
-
-            switch (test_username)
-            {
-            case "alice":
-                user_list.session = "ubuntu";
-                break;
-            case "bob":
-                user_list.session = "gnome-shell";
-                break;
-            case "carol":
-                user_list.session = "kde";
-                break;
-            default:
-                return;
-            }
-            have_session = true;
-            return;
-        }
-        else
-        {
-            if (greeter.authentication_user == null)
-                return;
-
-            var user = LightDM.UserList.get_instance ().get_user_by_name (greeter.authentication_user);
-            if (user == null)
-            {
-                user_list.session = greeter.default_session_hint;
-                return;
-            }
-
-            user_list.session = user.session;
-            have_session = true;
-        }
-    }
-
     private void show_message_cb (string text, LightDM.MessageType type)
     {
-        update_session ();
         user_list.show_message (text, type == LightDM.MessageType.ERROR);
     }
 
     private void show_prompt_cb (string text, LightDM.PromptType type)
     {
-        update_session ();
         update_other_label ();
 
         prompted = true;
@@ -336,7 +288,6 @@
 
     private void authentication_complete_cb ()
     {
-        update_session ();
         update_other_label ();
 
         bool is_authenticated;
@@ -394,10 +345,6 @@
         }
 
         user_list.set_error (null);
-        if (test_mode)
-            user_list.session = "ubuntu";
-        else
-            user_list.session = greeter.default_session_hint;        
         start_authentication ();
     }
 
@@ -418,13 +365,12 @@
                 text = greeter.authentication_user;
         }
 
-        user_list.add_entry ("*other", text, null, null);
+        user_list.add_entry ("*other", text, null, null, false, false, greeter.default_session_hint);
     }
 
     private void start_authentication ()
     {
         prompted = false;
-        have_session = false;
 
         if (test_mode)
         {
@@ -472,7 +418,6 @@
                 greeter.authenticate (user_list.selected);
         }
 
-        update_session ();
         update_other_label ();
     }
 

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-02-21 05:21:02 +0000
+++ src/user-list.vala	2012-02-22 04:29:17 +0000
@@ -42,11 +42,9 @@
 
     /* Keyboard layouts to use for this user by default */
     public List <LightDM.Layout> keyboard_layouts;
-}
 
-private class SessionMenuItem : Gtk.RadioMenuItem
-{
-    public string session_name;
+    /* Default session for this user */
+    public string session;
 }
 
 public class UserList : Gtk.EventBox
@@ -76,14 +74,18 @@
     private Fadable prompt_widget_to_show;
     private Gtk.Button session_button;
     private Gtk.Image session_image;
-    private Menu session_menu;
-    private Gdk.Pixbuf unknown_badge_pixbuf;
-    private Gdk.Pixbuf gnome_badge_pixbuf;
-    private Gdk.Pixbuf kde_badge_pixbuf;
-    private Gdk.Pixbuf recovery_console_badge_pixbuf;
-    private Gdk.Pixbuf ubuntu_badge_pixbuf;
-
-    unowned GLib.SList<SessionMenuItem> session_group = null;
+    private SessionChooser session_chooser;
+ 
+    private enum Mode
+    {
+        LOGIN,
+        TRANSFORM_TO_LOGIN_HIDE,
+        TRANSFORM_TO_LOGIN_SHOW,
+        SCROLLING,
+        SESSIONS,
+        TRANSFORM_TO_SESSIONS_HIDE,
+    }
+    private Mode mode = Mode.LOGIN;
 
     private bool complete = false;
 
@@ -120,55 +122,9 @@
         get { if (selected_entry == null) return null; return selected_entry.name; }
     }
 
-    public string? session
-    {
-        get
-        {
-            foreach (var item in session_group)
-            {
-                if (item.active)
-                    return item.session_name;
-            }
-            return null;
-        }
-        set
-        {
-            foreach (var item in session_group)
-            {
-                if (item.session_name == value)
-                {
-                    item.active = true;
-                    return;
-                }
-            }
-        }
-    }
+    public string? session {get; private set;}
 
     private Gdk.Pixbuf? last_session_badge = null;
-    private Gdk.Pixbuf? session_badge
-    {
-        get
-        {
-            switch (session)
-            {
-            case "ubuntu":
-            case "ubuntu-2d":
-            /* NOTE: For legacy reasons 'gnome' is actually Ubuntu */
-            case "gnome":
-                return ubuntu_badge_pixbuf;
-            case "gnome-classic":
-            case "gnome-fallback":
-            case "gnome-shell":
-                return gnome_badge_pixbuf;
-            case "kde":
-                return kde_badge_pixbuf;
-            case "xterm":
-                return recovery_console_badge_pixbuf;
-            default:
-                return unknown_badge_pixbuf;
-            }        
-        }
-    }
 
     public UserList (Background bg, MenuBar mb)
     {
@@ -185,6 +141,12 @@
         login_box.show ();
         add_with_class (login_box);
 
+        session_chooser = new SessionChooser ();
+        session_chooser.session_clicked.connect (session_clicked_cb);
+        session_chooser.fade_done.connect (session_fade_done_cb);
+        session_chooser.show ();
+        UnityGreeter.add_style_class (session_chooser);
+
         prompt_entry = new DashEntry ();
         prompt_entry.caps_lock_warning = true;
 
@@ -204,23 +166,10 @@
             debug ("Error loading message image: %s", e.message);
         }
 
-        try
-        {
-            unknown_badge_pixbuf = new Gdk.Pixbuf.from_file (Path.build_filename (Config.PKGDATADIR, "unknown_badge.png", null));
-            gnome_badge_pixbuf = new Gdk.Pixbuf.from_file (Path.build_filename (Config.PKGDATADIR, "gnome_badge.png"));
-            kde_badge_pixbuf = new Gdk.Pixbuf.from_file (Path.build_filename (Config.PKGDATADIR, "kde_badge.png"));
-            recovery_console_badge_pixbuf = new Gdk.Pixbuf.from_file (Path.build_filename (Config.PKGDATADIR, "recovery_console_badge.png"));
-            ubuntu_badge_pixbuf = new Gdk.Pixbuf.from_file (Path.build_filename (Config.PKGDATADIR, "ubuntu_badge.png"));
-        }
-        catch (Error e)
-        {
-            debug ("Error loading image: %s", e.message);
-        }
-
         session_button = new Gtk.Button ();
         session_button.focus_on_click = false;
         session_button.get_accessible ().set_name (_("Session Options"));
-        session_image = new Gtk.Image.from_pixbuf (session_badge);
+        session_image = new Gtk.Image.from_pixbuf (SessionChooser.get_badge (session));
         session_image.show ();
         session_button.relief = Gtk.ReliefStyle.NONE;
         session_button.add (session_image);
@@ -228,9 +177,6 @@
         session_button.show ();
         add_with_class (session_button);
 
-        session_menu = new Menu (background);
-        UnityGreeter.add_style_class (session_menu);
-
         scroll_timer = new AnimateTimer (AnimateTimer.FAST);
         scroll_timer.animate.connect (scroll_animate_cb);
     }
@@ -245,6 +191,9 @@
 
     public void scroll (ScrollTarget target)
     {
+        if (mode != Mode.LOGIN && mode != Mode.SCROLLING)
+            return;
+
         switch (target)
         {
         case ScrollTarget.START:
@@ -286,8 +235,8 @@
     private void redraw_login_box ()
     {
         Gtk.Allocation allocation;
-        get_allocation (out allocation);
-        queue_draw_area (allocation.x + box_x, allocation.y + box_y, box_width * grid_size, box_height * grid_size);
+        login_box.get_allocation (out allocation);
+        queue_draw_area (allocation.x, allocation.y, allocation.width, allocation.height);
     }
 
     public void show_message (string text, bool error = false)
@@ -320,7 +269,7 @@
         prompt_entry.text = "";
         prompt_entry.sensitive = true;
         prompt_entry.visibility = !secret;
-        if (scroll_timer.is_running)
+        if (mode == Mode.SCROLLING)
             prompt_widget_to_show = prompt_entry;
         else
             prompt_entry.show ();
@@ -343,7 +292,7 @@
         prompt_entry.hide ();
         login_button.hide ();
         message = "";
-        if (scroll_timer.is_running)
+        if (mode == Mode.SCROLLING)
           prompt_widget_to_show = login_button;
         else
           login_button.show();
@@ -373,26 +322,6 @@
         redraw_login_box ();
     }
 
-    public void add_session (string name, string label)
-    {
-        var item = new SessionMenuItem ();
-        item.set_group (session_group);
-        item.session_name = name;
-        item.label = label;
-        item.show ();
-        item.toggled.connect (session_changed_cb);
-        session_menu.append (item);
-        session_group = (GLib.SList<SessionMenuItem>) item.get_group ();
-    }
-    
-    private void session_changed_cb (Gtk.CheckMenuItem item)
-    {
-        if (!item.active)
-            return;
-            
-        session_image.set_from_pixbuf (session_badge);
-    }
-
     private UserEntry? find_entry (string name)
     {
         foreach (var entry in entries)
@@ -404,7 +333,7 @@
         return null;
     }
 
-    public void add_entry (string name, string label, string? background, List <LightDM.Layout>? keyboard_layouts, bool is_active = false, bool has_messages = false)
+    public void add_entry (string name, string label, string? background, List <LightDM.Layout>? keyboard_layouts, bool is_active = false, bool has_messages = false, string? session = null)
     {
         var e = find_entry (name);
         if (e == null)
@@ -419,6 +348,7 @@
         e.keyboard_layouts = keyboard_layouts.copy ();
         e.is_active = is_active;
         e.has_messages = has_messages;
+        e.session = (session == null) ? "ubuntu" : session;
 
         if (selected_entry == null)
             select_entry (e, 1.0);
@@ -467,24 +397,99 @@
         start_session ();
     }
 
-    private void session_menu_position_cb (Gtk.Menu menu, out int x, out int y, out bool push_in)
-    {
-        Gtk.Allocation button_allocation;
-        session_button.get_allocation (out button_allocation);
-
-        get_window ().get_origin (out x, out y);
-        x += button_allocation.x;
-        y += button_allocation.y + button_allocation.height;
-        push_in = true;
-    }
-
     private void session_button_clicked_cb ()
     {
-        session_menu.popup (null, null, session_menu_position_cb, 0, Gtk.get_current_event_time ());
+        return_if_fail (mode == Mode.LOGIN);
+        mode = Mode.TRANSFORM_TO_SESSIONS_HIDE;
+        scroll_timer.reset (AnimateTimer.INSTANT);
+    }
+
+    private void change_session (string session)
+    {
+        this.session = session;
+        session_image.set_from_pixbuf (SessionChooser.get_badge (session));
+    }
+
+    private void session_clicked_cb (string? session)
+    {
+        return_if_fail (mode == Mode.SESSIONS);
+
+        mode = Mode.TRANSFORM_TO_LOGIN_HIDE;
+        session_chooser.fade_out ();
+
+        if (session != null)
+            change_session (session);
+    }
+
+    private void session_fade_done_cb ()
+    {
+        /* Either a fade in into SESSIONS mode or a fade out from SESSIONS mode */
+        if (mode == Mode.TRANSFORM_TO_LOGIN_HIDE)
+        {
+            login_box.remove (session_chooser);
+            mode = Mode.TRANSFORM_TO_LOGIN_SHOW;
+            scroll_timer.reset (AnimateTimer.INSTANT);
+
+            if (prompt_entry.visible)
+                prompt_entry.grab_focus ();
+            else if (login_button.visible)
+                login_button.grab_focus ();
+        }
     }
 
     private void scroll_animate_cb (double progress)
     {
+        switch (mode)
+        {
+        case Mode.SCROLLING:
+            animate_scrolling (progress);
+            break;
+        case Mode.TRANSFORM_TO_SESSIONS_HIDE:
+            animate_to_sessions_hide (progress);
+            break;
+        case Mode.TRANSFORM_TO_LOGIN_SHOW:
+            animate_to_login (progress);
+            break;
+        }
+    }
+
+    private void animate_to_sessions_hide (double progress)
+    {
+        allocate_login_box ();
+
+        /* Stop when we get there */
+        if (progress >= 1.0)
+            finished_to_sessions_hide ();
+
+        redraw_user_list ();
+    }
+
+    private void finished_to_sessions_hide ()
+    {
+        login_box.add (session_chooser);
+        session_chooser.grab_focus ();
+        session_chooser.fade_in ();
+        mode = Mode.SESSIONS;
+    }
+
+    private void animate_to_login (double progress)
+    {
+        allocate_login_box ();
+
+        /* Stop when we get there */
+        if (progress >= 1.0)
+            finished_to_login ();
+
+        redraw_user_list ();
+    }
+
+    private void finished_to_login ()
+    {
+        mode = Mode.LOGIN;
+    }
+
+    private void animate_scrolling (double progress)
+    {
         /* Total height of list */
         var h = entries.length ();
 
@@ -508,10 +513,10 @@
 
         /* Stop when we get there */
         if (progress >= 1.0)
-            finished_animating ();
+            finished_scrolling ();
     }
 
-    private void finished_animating ()
+    private void finished_scrolling ()
     {
         if (prompt_widget_to_show != null)
         {
@@ -520,16 +525,18 @@
         }
         session_button.show ();
         user_displayed ();
+        mode = Mode.LOGIN;
     }
 
     private void select_entry (UserEntry entry, double direction)
     {
-        last_session_badge = session_badge;
+        last_session_badge = SessionChooser.get_badge (session);
 
         if (!get_realized ())
         {
             /* Just note it for the future if we haven't been realized yet */
             selected_entry = entry;
+            change_session (entry.session);
             return;
         }
 
@@ -538,15 +545,15 @@
             var old_target = scroll_target_location;
             var new_target = entries.index (entry);
             var new_direction = direction;
-            var new_start = scroll_timer.is_running ? scroll_start_location : scroll_location;
+            var new_start = (mode == Mode.SCROLLING) ? scroll_start_location : scroll_location;
 
-            if (scroll_timer.is_running && scroll_direction != new_direction)
+            if (mode == Mode.SCROLLING && scroll_direction != new_direction)
                 return; /* ignore requests when we're already scrolling the opposite way */
 
             if (scroll_location != new_target)
             {
                 var new_distance = new_direction * (new_target - new_start);
-                if (scroll_timer.is_running)
+                if (mode == Mode.SCROLLING)
                 {
                     var old_distance = new_direction * (old_target - new_start);
                     if (!scroll_timer.extend ((new_distance - old_distance) / old_distance))
@@ -565,6 +572,8 @@
                 prompt_entry.hide ();
                 login_button.hide ();
                 session_button.hide ();
+
+                mode = Mode.SCROLLING;
             }
 
             scroll_target_location = new_target;
@@ -575,9 +584,10 @@
         if (selected_entry != entry)
         {
             selected_entry = entry;
+            change_session (entry.session);
             user_selected (selected_entry.name);
 
-            if (!scroll_timer.is_running)
+            if (mode == Mode.LOGIN)
                 user_displayed (); /* didn't need to move, make sure we trigger side effects */
         }
     }
@@ -591,20 +601,64 @@
         select_entry (saved_entry, 1);
     }
 
-    public override void size_allocate (Gtk.Allocation allocation)
+    private int round_up_to_grid_size (int size)
     {
-        base.size_allocate (allocation);
+        if (size % grid_size == 0)
+            return size;
+        else
+            return (size / grid_size + 1) * grid_size;
+    }
 
-        if (!get_realized ())
-            return;
+    private void allocate_login_box ()
+    {
+        Gtk.Allocation allocation;
+        get_allocation (out allocation);
 
         var child_allocation = Gtk.Allocation ();
-
         child_allocation.x = allocation.x + box_x + 6;
         child_allocation.y = allocation.y + box_y + 6;
         child_allocation.width = grid_size * box_width - 12;
-        child_allocation.height = grid_size * box_height - 12;
+        child_allocation.height = grid_size * box_height - 6;
+
+        Gtk.Requisition session_request;
+        session_chooser.get_preferred_size (null, out session_request);
+        var session_height = round_up_to_grid_size (session_request.height + 12);
+        if ((session_height / grid_size) % 2 == 0)
+            session_height += grid_size; /* make sure we expand equally top and bottom */
+        session_height -= 12;
+        session_height = int.max (session_height, child_allocation.height);
+        var session_distance = session_height - child_allocation.height;
+
+        switch (mode)
+        {
+        case Mode.TRANSFORM_TO_SESSIONS_HIDE:
+            child_allocation.height += (int) (scroll_timer.progress * session_distance);
+            child_allocation.y -= (int) (scroll_timer.progress * session_distance) / 2;
+            break;
+        case Mode.SESSIONS:
+        case Mode.TRANSFORM_TO_LOGIN_HIDE:
+            child_allocation.height = session_height;
+            child_allocation.y -= session_distance / 2;
+            break;
+        case Mode.TRANSFORM_TO_LOGIN_SHOW:
+            child_allocation.height = session_height - (int) (scroll_timer.progress * session_distance);
+            child_allocation.y -= (int) ((1.0 - scroll_timer.progress) * session_distance) / 2;
+            break;
+        }
+
         login_box.size_allocate (child_allocation);
+    }
+
+    public override void size_allocate (Gtk.Allocation allocation)
+    {
+        base.size_allocate (allocation);
+
+        if (!get_realized ())
+            return;
+
+        allocate_login_box ();
+
+        var child_allocation = Gtk.Allocation ();
 
         /* Put prompt entry and login button inside login box */
         child_allocation.x = allocation.x + box_x + grid_size / 2;
@@ -673,7 +727,7 @@
         c.restore ();
 
         /* Now draw session button if we're animating in the box */
-        if (in_box && scroll_timer.is_running && badge != null)
+        if (in_box && mode == Mode.SCROLLING && badge != null)
         {
             c.save ();
             var xpadding = (grid_size - badge.width) / 2;
@@ -701,12 +755,44 @@
 
     public override bool draw (Cairo.Context c)
     {
+        var max_alpha = 1.0;
+        if (mode == Mode.TRANSFORM_TO_SESSIONS_HIDE)
+            max_alpha = 1.0 - scroll_timer.progress;
+        else if (mode == Mode.TRANSFORM_TO_LOGIN_SHOW)
+            max_alpha = scroll_timer.progress;
+
         c.save ();
-        base.draw (c);
+        fixed.propagate_draw (login_box, c); /* Always full alpha */
         c.restore ();
 
+        if (mode == Mode.LOGIN ||
+            mode == Mode.SCROLLING ||
+            mode == Mode.TRANSFORM_TO_SESSIONS_HIDE ||
+            mode == Mode.TRANSFORM_TO_LOGIN_SHOW)
+        {
+            c.save ();
+            c.push_group ();
+
+            draw_names (c, NameLocation.OUTSIDE_BOX);
+            draw_box_contents (c);
+            draw_names (c, NameLocation.INSIDE_BOX);
+
+            c.pop_group_to_source ();
+            c.paint_with_alpha (max_alpha);
+            c.restore ();
+        }
+
+        return false;
+    }
+
+    private enum NameLocation
+    {
+        INSIDE_BOX,
+        OUTSIDE_BOX,
+    }
+    private void draw_names (Cairo.Context c, NameLocation where)
+    {
         c.save ();
-
         c.translate (box_x, box_y);
 
         var index = 0;
@@ -715,7 +801,7 @@
             var position = index - scroll_location;
 
             /* Draw entries above the box */
-            if (position < 0)
+            if (where == NameLocation.OUTSIDE_BOX && position < 0)
             {
                 var h_above = (double) (n_above + 1) * grid_size;
                 c.save ();
@@ -728,7 +814,7 @@
             }
 
             /* Draw entries in the box */
-            if (position > -1 && position < 1 && scroll_timer.is_running)
+            if (where == NameLocation.INSIDE_BOX && position > -1 && position < 1 && mode == Mode.SCROLLING)
             {
                 c.save ();
                 c.translate (0, border);
@@ -737,7 +823,7 @@
 
                 var badge = last_session_badge;
                 if (entry == selected_entry)
-                    badge = session_badge;
+                    badge = SessionChooser.get_badge (session);
 
                 if (position <= 0) /* top of box, normal pace */
                     draw_entry_at_position (c, entry, position, true, badge);
@@ -748,7 +834,7 @@
             }
 
             /* Draw entries below the box */
-            if (position > 0)
+            if (where == NameLocation.OUTSIDE_BOX && position > 0)
             {
                 var h_below = (double) (n_below + 1) * grid_size;
                 c.save ();
@@ -763,24 +849,35 @@
             index++;
         }
 
+        c.restore ();
+    }
+
+    private void draw_box_contents (Cairo.Context c)
+    {
+        foreach (var child in fixed.get_children ())
+        {
+            if (child != login_box)
+                fixed.propagate_draw (child, c);
+        }
+
+        c.save ();
+
+        c.translate (box_x, box_y);
+
         /* Selected item */
-        if (selected_entry != null && !scroll_timer.is_running)
+        if (selected_entry != null && mode != Mode.SCROLLING)
         {
-            var text_y = border;
+            c.save ();
 
-            c.save ();
             c.rectangle (border, border, box_width * grid_size - border * 2, box_height * grid_size - border * 2);
             c.clip ();
-
-            c.save ();
-            c.translate (0, text_y);
+            c.translate (0, border);
             draw_entry (c, selected_entry, 1.0, true);
-            c.restore ();
 
             c.restore ();
         }
 
-        if ((error != null || message != null) && !scroll_timer.is_running)
+        if ((error != null || message != null) && mode != Mode.SCROLLING)
         {
             string text;
             if (error == null)
@@ -818,8 +915,6 @@
         }
 
         c.restore ();
-
-        return false;
     }
 
     private bool inside_entry (double x, double y, double entry_y, UserEntry entry)
@@ -839,6 +934,9 @@
 
     public override bool button_release_event (Gdk.EventButton event)
     {
+        if (mode != Mode.LOGIN)
+            return false;
+
         var x = event.x - box_x;
         var y = event.y - box_y;