Merge lp:~mterry/unity-greeter/click-fixes into lp:unity-greeter

[Michael Terry]

This branch fixes two things:

1) A long standing issue where clicks past the beginning or end of the user list will 'wrap around' the list despite the user having clicked on "thin air".

2) And restoring the click functionality at all after I broke it with the refactor. I forgot that GtkFixed is a non-input-window widget. So I added an EventBox to capture clicks.

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-01-31 14:43:25 +0000
+++ src/user-list.vala	2012-02-02 03:02:29 +0000
@@ -46,7 +46,7 @@
     public string session_name;
 }
 
-public class UserList : Gtk.Fixed
+public class UserList : Gtk.EventBox
 {
     public Background background;
     public MenuBar menubar;
@@ -64,6 +64,7 @@
     private string? error;
     private string? message;
 
+    private Gtk.Fixed fixed;
     private Gtk.Box login_box;
     private DashEntry prompt_entry;
     private DashButton login_button;
@@ -137,6 +138,11 @@
         background = bg;
         menubar = mb;
         can_focus = false;
+        visible_window = false;
+
+        fixed = new Gtk.Fixed ();
+        fixed.show ();
+        add (fixed);
 
         login_box = new DashBox (background);
         login_box.show ();
@@ -217,7 +223,7 @@
 
     private void add_with_class (Gtk.Widget widget)
     {
-        add (widget);
+        fixed.add (widget);
         UnityGreeter.add_style_class (widget);
     }
 
@@ -517,7 +523,7 @@
     public override void size_allocate (Gtk.Allocation allocation)
     {
         var resized = allocation.height != get_allocated_height () || allocation.width != get_allocated_width ();
-        set_allocation (allocation);
+        base.size_allocate (allocation);
 
         if (!get_realized ())
             return;
@@ -757,7 +763,7 @@
         var x = event.x - box_x;
         var y = event.y - box_y;
 
-        /* Total height of list */        
+        /* Total height of list */
         var h = (double) entries.length () * grid_size;
 
         var offset = 0.0;
@@ -767,7 +773,7 @@
 
             /* Check entry above the box */
             var h_above = (double) n_above * grid_size;
-            if (y < 0 && y > -h_above)
+            if (entry_y < 0 && y < 0 && y > -h_above)
             {
                 if (inside_entry (x, y, entry_y, entry) ||
                     inside_entry (x, y, entry_y - h, entry))
@@ -780,7 +786,7 @@
             /* Check entry below the box */
             var below_y = y - box_height * grid_size;
             var h_below = (double) n_below * grid_size;
-            if (below_y > 0 && below_y < h_below)
+            if (entry_y > 0 && below_y > 0 && below_y < h_below)
             {
                 if (inside_entry (x, below_y, entry_y - grid_size, entry) ||
                     inside_entry (x, below_y, entry_y - grid_size + h, entry))