Merge lp:~mterry/unity-greeter/button-fixups into lp:unity-greeter

[Michael Terry]

This makes the buttons like the session change button in the greeter act "flat" (no visual change when clicked or moused over), while still letting a focus border appear when navigating with the keyboard.

It also adds a border around the session chooser list like the mockups have.

One unfortunate thing is that in order to achieve the flat look, I needed to override "pressed" and "released" methods in Gtk.Button which are marked deprecated by vala. (They are deprecated for API use, but they are internally used and I needed to override those functions specifically.) I could not find a way to shut valac up about it. So this branch adds two warnings to the build.

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-08-30 16:15:45 +0000
+++ src/Makefile.am	2012-10-23 20:05:32 +0000
@@ -16,6 +16,7 @@
 	fadable.vala \
 	fadable-box.vala \
 	fading-label.vala \
+	flat-button.vala \
 	greeter-list.vala \
 	list-stack.vala \
 	main-window.vala \
@@ -26,6 +27,7 @@
 	remote-login-service.vala \
 	settings.vala \
 	settings-daemon.vala \
+	toggle-box.vala \
 	unity-greeter.vala \
 	user-list.vala \
 	user-prompt-box.vala
 
=== modified file 'src/dash-box.vala'
--- src/dash-box.vala	2012-08-27 22:30:33 +0000
+++ src/dash-box.vala	2012-10-23 20:05:32 +0000
@@ -228,9 +228,9 @@
         return base.draw (c);
     }
 
-    private void cairo_rounded_rectangle (Cairo.Context c, double x, double y,
-                                          double width, double height,
-                                          double radius)
+    public static void cairo_rounded_rectangle (Cairo.Context c, double x,
+                                                double y, double width,
+                                                double height, double radius)
     {
         var w = width - radius * 2;
         var h = height - radius * 2;
 
=== modified file 'src/dash-button.vala'
--- src/dash-button.vala	2012-08-27 22:30:33 +0000
+++ src/dash-button.vala	2012-10-23 20:05:32 +0000
@@ -17,7 +17,7 @@
  * Authors: Michael Terry <[e-mail]>
  */
 
-public class DashButton : Gtk.Button, Fadable
+public class DashButton : FlatButton, Fadable
 {
     protected FadeTracker fade_tracker { get; protected set; }
     private Gtk.Label text_label;
@@ -67,7 +67,9 @@
         try
         {
             var style = new Gtk.CssProvider ();
-            style.load_from_data ("* {padding: 8px;}", -1);
+            style.load_from_data ("* {padding: 8px;
+                                      -GtkWidget-focus-line-width: 0px;
+                                     }", -1);
             this.get_style_context ().add_provider (style, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
         }
         catch (Error e)
 
=== added file 'src/flat-button.vala'
--- src/flat-button.vala	1970-01-01 00:00:00 +0000
+++ src/flat-button.vala	2012-10-23 20:05:32 +0000
@@ -0,0 +1,66 @@
+/* -*- 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 FlatButton : Gtk.Button
+{
+    private bool did_press;
+
+    construct
+    {
+        UnityGreeter.add_style_class (this);
+        try
+        {
+            var style = new Gtk.CssProvider ();
+            style.load_from_data ("* {-GtkButton-child-displacement-x: 0px;
+                                      -GtkButton-child-displacement-y: 0px;
+                                      -GtkWidget-focus-line-width: 1px;
+                                      }", -1);
+            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)
+    {
+        // Make sure we don't react to mouse hovers
+        unset_state_flags (Gtk.StateFlags.PRELIGHT);
+        return base.draw (c);
+    }
+
+    public override void pressed ()
+    {
+        // Do nothing.  The normal handler sets priv->button_down which
+        // internally causes draw() to draw a special border and background
+        // that we don't want.
+        did_press = true;
+    }
+
+    public override void released ()
+    {
+        if (did_press)
+        {
+            base.pressed (); // fake an insta-click
+            did_press = false;
+        }
+        base.released ();
+    }
+}
 
=== modified file 'src/main-window.vala'
--- src/main-window.vala	2012-09-12 14:43:30 +0000
+++ src/main-window.vala	2012-10-23 20:05:32 +0000
@@ -105,12 +105,12 @@
         align.show ();
         hbox.add (align);
 
-        back_button = new Gtk.Button ();
+        back_button = new FlatButton ();
+        back_button.focus_on_click = false;
         var image = new Gtk.Image.from_file (Path.build_filename (Config.PKGDATADIR, "arrow_left.png", null));
         image.show ();
         back_button.set_size_request (grid_size - GreeterList.BORDER * 2, grid_size - GreeterList.BORDER * 2);
         back_button.add (image);
-        UnityGreeter.add_style_class (back_button);
         back_button.clicked.connect (pop_list);
         align.add (back_button);
 
 
=== modified file 'src/prompt-box.vala'
--- src/prompt-box.vala	2012-10-22 20:46:56 +0000
+++ src/prompt-box.vala	2012-10-23 20:05:32 +0000
@@ -52,7 +52,7 @@
     protected Gtk.Grid name_grid;
     private ActiveIndicator active_indicator;
     protected FadingLabel name_label;
-    protected Gtk.Button option_button;
+    protected FlatButton option_button;
     private CachedImage option_image;
     private CachedImage message_image;
 
@@ -203,7 +203,7 @@
         align.show ();
         name_grid.attach (align, COL_NAME_MESSAGE, ROW_NAME, 1, 1);
 
-        option_button = new Gtk.Button ();
+        option_button = new FlatButton ();
         option_button.hexpand = true;
         option_button.halign = Gtk.Align.END;
         option_button.valign = Gtk.Align.START;
@@ -214,7 +214,6 @@
         option_button.clicked.connect (option_button_clicked_cb);
         option_image = new CachedImage (null);
         option_image.show ();
-        UnityGreeter.add_style_class (option_button);
         try
         {
             var style = new Gtk.CssProvider ();
 
=== modified file 'src/session-list.vala'
--- src/session-list.vala	2012-10-22 20:12:58 +0000
+++ src/session-list.vala	2012-10-23 20:05:32 +0000
@@ -27,115 +27,39 @@
         Object (id: id, session: session, default_session: default_session);
     }
 
+    private ToggleBox box;
+
     construct
     {
         label = _("Select desktop environment");
+        name_label.vexpand = false;
+
+        box = new ToggleBox (default_session, session);
 
         if (UnityGreeter.singleton.test_mode)
         {
-            add_session ("gnome", "GNOME");
-            add_session ("kde", "KDE");
-            add_session ("ubuntu", "Ubuntu");
+            box.add_item ("gnome", "GNOME", SessionList.get_badge ("gnome"));
+            box.add_item ("kde", "KDE", SessionList.get_badge ("kde"));
+            box.add_item ("ubuntu", "Ubuntu", SessionList.get_badge ("ubuntu"));
         }
         else
         {
             foreach (var session in LightDM.get_sessions ())
             {
                 debug ("Adding session %s (%s)", session.key, session.name);
-                add_session (session.key, session.name);
-            }
-        }
-
-        name_label.vexpand = false;
-    }
-
-    private void add_session (string key, string name_in)
-    {
-        var item = new Gtk.Button ();
-        item.clicked.connect (button_clicked_cb);
-        UnityGreeter.add_style_class (item);
-
-        var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
-
-        var pixbuf = SessionList.get_badge (key);
-        if (pixbuf != null)
-        {
-            var image = new CachedImage (pixbuf);
-            hbox.pack_start (image, false, false, 0);
-        }
-
-        var name = name_in;
-        if (key == default_session)
-        {
-            /* Translators: %s is a session name like KDE or Ubuntu */
-            name = _("%s (Default)").printf (name);
-        }
-
-        var label = new Gtk.Label (null);
-        label.set_markup ("<span font=\"Ubuntu 13\">%s</span>".printf (name));
-        label.halign = Gtk.Align.START;
-        hbox.pack_start (label, true, true, 0);
-
-        item.hexpand = true;
-        item.add (hbox);
-        hbox.show_all ();
-
-        try
-        {
-            /* Tighten padding on buttons to not be so large */
-            var style = new Gtk.CssProvider ();
-            style.load_from_data ("* {padding: 8px;}", -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);
-        }
-
-        item.set_data<string> ("session-list-key", key);
-        attach_item (item);
-    }
-
-    private void set_button_highlighted (Gtk.Widget button, bool highlight)
-    {
-        Gdk.RGBA? color = null;
-        if (highlight)
-            color = { 0.5f, 0.5f, 0.5f, 0.4f };
-        button.override_background_color (Gtk.StateFlags.NORMAL, color);
-    }
-
-    private void button_clicked_cb (Gtk.Button button)
-    {
-        foreach_prompt_widget ((w) =>
-        {
-            set_button_highlighted (w, (w == button));
-        });
-        respond ({ button.get_data<string> ("session-list-key") });
-    }
-
-    public override void grab_focus ()
-    {
-        var done = false;
-        Gtk.Widget best = null;
-        foreach_prompt_widget ((w) =>
-        {
-            if (done)
-                return;
-            if (best == null)
-                best = w; /* first button wins, all else considered */
-            var key = w.get_data<string> ("session-list-key");
-            if (session == key || (session == null && default_session == key))
-            {
-                best = w;
-                done = true;
-            }
-        });
-
-        if (best != null)
-        {
-            best.grab_focus ();
-            set_button_highlighted (best, true);
-        }
+                box.add_item (session.key, session.name, SessionList.get_badge (session.key));
+            }
+        }
+
+        box.notify["selected-key"].connect (selected_cb);
+        box.show ();
+
+        attach_item (box);
+    }
+
+    private void selected_cb ()
+    {
+        respond ({ box.selected_key });
     }
 }
 
 
=== added file 'src/toggle-box.vala'
--- src/toggle-box.vala	1970-01-01 00:00:00 +0000
+++ src/toggle-box.vala	2012-10-23 20:05:32 +0000
@@ -0,0 +1,131 @@
+/* -*- 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 ToggleBox : Gtk.Box
+{
+    public string default_key {get; construct;}
+    public string starting_key {get; construct;}
+    public string selected_key {get; protected set;}
+
+    public ToggleBox (string? default_key, string? starting_key)
+    {
+        Object (default_key: default_key, starting_key: starting_key,
+                selected_key: starting_key);
+    }
+
+    public void add_item (string key, string label, Gdk.Pixbuf? icon)
+    {
+        var item = make_button (key, label, icon);
+
+        if (get_children () == null ||
+            (starting_key == null && default_key == key) ||
+            starting_key == key)
+            select (item);
+
+        item.show ();
+        add (item);
+    }
+
+    private Gtk.Button selected_button;
+
+    construct
+    {
+        orientation = Gtk.Orientation.VERTICAL;
+    }
+
+    public override bool draw (Cairo.Context c)
+    {
+        Gtk.Allocation allocation;
+        get_allocation (out allocation);
+
+        DashBox.cairo_rounded_rectangle (c, 0, 0, allocation.width,
+                                         allocation.height, 0.1 * grid_size);
+        c.set_source_rgba (0.5, 0.5, 0.5, 0.5);
+        c.set_line_width (1);
+        c.stroke ();
+
+        return base.draw (c);
+    }
+
+    private void select (Gtk.Button button)
+    {
+        if (selected_button != null)
+            selected_button.relief = Gtk.ReliefStyle.NONE;
+        selected_button = button;
+        selected_button.relief = Gtk.ReliefStyle.NORMAL;
+        selected_key = selected_button.get_data<string> ("toggle-list-key");
+    }
+
+    private Gtk.Button make_button (string key, string name_in, Gdk.Pixbuf? icon)
+    {
+        var item = new FlatButton ();
+        item.relief = Gtk.ReliefStyle.NONE;
+        item.clicked.connect (button_clicked_cb);
+
+        var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+
+        if (icon != null)
+        {
+            var image = new CachedImage (icon);
+            hbox.pack_start (image, false, false, 0);
+        }
+
+        var name = name_in;
+        if (key == default_key)
+        {
+            /* Translators: %s is a session name like KDE or Ubuntu */
+            name = _("%s (Default)").printf (name);
+        }
+
+        var label = new Gtk.Label (null);
+        label.set_markup ("<span font=\"Ubuntu 13\">%s</span>".printf (name));
+        label.halign = Gtk.Align.START;
+        hbox.pack_start (label, true, true, 0);
+
+        item.hexpand = true;
+        item.add (hbox);
+        hbox.show_all ();
+
+        try
+        {
+            /* Tighten padding on buttons to not be so large */
+            var style = new Gtk.CssProvider ();
+            style.load_from_data ("* {padding: 8px;}", -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);
+        }
+
+        item.set_data<string> ("toggle-list-key", key);
+        return item;
+    }
+
+    private void button_clicked_cb (Gtk.Button button)
+    {
+        selected_key = button.get_data<string> ("toggle-list-key");
+    }
+
+    public override void grab_focus ()
+    {
+        if (selected_button != null)
+            selected_button.grab_focus ();
+    }
+}