Merge lp:~3v1n0/unity-greeter/shutdown-buttons-fixes into lp:unity-greeter

[Marco Trevisan (Treviño)]

ShutdownDialog: match the close button state and fix paddings

The close button didn't update to match the current button state (prelighted or activated), code updated to make it work. Some code cleanup of the DialogButton class as well.

Fixed the main vbox margings to match the real unity dialogs and fixed the internal padding of the dialog buttons.
Unfortunately, this was caused by the theming of the GtkButton and the fastest way I found was to just ignore theming for such buttons not to re-implement buttons logic by scratch.

Here's how it looks after these fixes: http://i.imgur.com/0ibwtkE.png (it was http://i.imgur.com/UUoSMUC.png)

[Robert Ancell (robert-ancell)]

Looks good!

review: Approve

[Robert Ancell (robert-ancell)]

Actually if I hold down the pointer on the close button I get a "missing image" icon.

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

> Actually if I hold down the pointer on the close button I get a "missing
> image" icon.

That's weird... It works here... It didn't find the new dialog_close_press.png in your installation path?

[Robert Ancell (robert-ancell)]

It's missing from data/Makefile.am

[lp:~3v1n0/unity-greeter/shutdown-buttons-fixes]

1020. By Marco Trevisan (Treviño) on 2013-11-13

data/Makefile.am: add missing dialog_close_press.png file

[Marco Trevisan (Treviño) (3v1n0)]

> It's missing from data/Makefile.am

Indeed! I'm too used to unity's cmake automatic management of the resource files... :)
Fix pushed.

[Robert Ancell (robert-ancell)]

review: Approve

[lp:~3v1n0/unity-greeter/shutdown-buttons-fixes]

1021. By Marco Trevisan (Treviño) on 2013-11-13

ShutdownDialog: override the DialogButton style with one with no paddings or border

This properly fixes the extra padding we had around our buttons

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-10-21 04:26:35 +0000
+++ data/Makefile.am	2013-11-13 05:19:20 +0000
@@ -9,8 +9,9 @@
 	arrow_left.png \
 	arrow_right.png \
 	cof.png \
+	dialog_close.png \
 	dialog_close_highlight.png \
-	dialog_close.png \
+	dialog_close_press.png \
 	gnome_badge.png \
 	hibernate_highlight.png \
 	hibernate.png \

=== added file 'data/dialog_close_press.png'
Binary files data/dialog_close_press.png	1970-01-01 00:00:00 +0000 and data/dialog_close_press.png	2013-11-13 05:19:20 +0000 differ
=== modified file 'src/shutdown-dialog.vala'
--- src/shutdown-dialog.vala	2013-11-05 04:14:44 +0000
+++ src/shutdown-dialog.vala	2013-11-13 05:19:20 +0000
@@ -34,9 +34,10 @@
     private Cairo.Pattern? corner_pattern = null;
     private Cairo.Pattern? left_pattern = null;
     private Cairo.Pattern? top_pattern = null;
-    
+
     private const int BORDER_SIZE = 30;
     private const int CLOSE_OFFSET = 3;
+    private const int BUTTON_TEXT_SPACE = 9;
 
     private Gtk.Box vbox;
     private DialogButton close_button;
@@ -48,7 +49,10 @@
         vbox.visible = true;
         add (vbox);
 
-        vbox.border_width = 20;
+        vbox.margin_top = 10;
+        vbox.margin_left = 22;
+        vbox.margin_right = 18;
+        vbox.margin_bottom = 0;
 
         var title_label = new Gtk.Label (_("Shutdown"));
         title_label.override_font (Pango.FontDescription.from_string ("Ubuntu Light 15"));
@@ -58,7 +62,9 @@
 
         string text;
         if (type == ShutdownDialogType.SHUTDOWN)
+        {
             text = _("Goodbye. Would you like to…");
+        }
         else
         {
             text = _("Are you sure you want to shut down the computer?");
@@ -147,7 +153,7 @@
             });
         }
 
-        close_button = new DialogButton (Path.build_filename (Config.PKGDATADIR, "dialog_close.png"), Path.build_filename (Config.PKGDATADIR, "dialog_close_highlight.png"));
+        close_button = new DialogButton (Path.build_filename (Config.PKGDATADIR, "dialog_close.png"), Path.build_filename (Config.PKGDATADIR, "dialog_close_highlight.png"), Path.build_filename (Config.PKGDATADIR, "dialog_close_press.png"));
         close_button.can_focus = false;
         close_button.clicked.connect (() => { close (); });
         close_button.visible = true;
@@ -193,7 +199,7 @@
         a.x = content_allocation.x - BORDER_SIZE + CLOSE_OFFSET;
         a.y = content_allocation.y - BORDER_SIZE + CLOSE_OFFSET;
         a.width = minimum_width;
-        a.height = minimum_height;       
+        a.height = minimum_height;
         close_button.size_allocate (a);
     }
 
@@ -211,8 +217,8 @@
             top_pattern.set_extend (Cairo.Extend.REPEAT);
         }
 
-        var width = vbox.get_allocated_width () + 20 * 2 + BORDER_SIZE * 2;
-        var height = vbox.get_allocated_height () + 20 * 2 + BORDER_SIZE * 2;
+        var width = vbox.get_allocated_width () + BORDER_SIZE * 2 + vbox.margin_left + vbox.margin_right;
+        var height = vbox.get_allocated_height () + BORDER_SIZE * 2 + vbox.margin_top + vbox.margin_bottom;
 
         /* Darken background */
         c.set_source_rgba (0, 0, 0, 0.25);
@@ -289,10 +295,10 @@
         c.fill ();
 
         /* Background */
-        DashBox.cairo_rounded_rectangle (c, 20, 20, width - 40, height - 40, 5);
+        DashBox.cairo_rounded_rectangle (c, 20, 20, width - 40, height - 40, 4);
         c.set_source_rgba (0, 0, 0, 0.75);
         c.fill ();
-       
+
         c.restore ();
 
         return base.draw (c);
@@ -308,15 +314,12 @@
 
     private DialogButton add_button (string text, string inactive_filename, string active_filename)
     {
-        var b = new Gtk.Box (Gtk.Orientation.VERTICAL, 9);
+        var b = new Gtk.Box (Gtk.Orientation.VERTICAL, BUTTON_TEXT_SPACE);
         b.visible = true;
         button_box.pack_start (b, false, false, 0);
 
         var label = new Gtk.Label (text);
-        label.visible = true;
-        label.override_font (Pango.FontDescription.from_string ("Ubuntu Light 12"));
-        label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 0.0f });
-        var button = new DialogButton (inactive_filename, active_filename, label);
+        var button = new DialogButton (inactive_filename, active_filename, null, label);
         button.visible = true;
 
         b.pack_start (button, false, false, 0);
@@ -329,22 +332,47 @@
 private class DialogButton : Gtk.Button
 {
     private string inactive_filename;
-    private string active_filename;
+    private string focused_filename;
+    private string? active_filename;
     private Gtk.Image i;
     private Gtk.Label? l;
-    
-    public DialogButton (string inactive_filename, string active_filename, Gtk.Label? label = null)
+
+    public DialogButton (string inactive_filename, string focused_filename, string? active_filename, Gtk.Label? label = null)
     {
         this.inactive_filename = inactive_filename;
+        this.focused_filename = focused_filename;
         this.active_filename = active_filename;
-        l = label;
         relief = Gtk.ReliefStyle.NONE;
         focus_on_click = false;
         i = new Gtk.Image.from_file (inactive_filename);
         i.visible = true;
         add (i);
+
+        l = label;
+
+        if (l != null)
+        {
+            l.visible = true;
+            l.override_font (Pango.FontDescription.from_string ("Ubuntu Light 12"));
+            l.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 0.0f });
+            l.override_color (Gtk.StateFlags.FOCUSED, { 1.0f, 1.0f, 1.0f, 1.0f });
+            l.override_color (Gtk.StateFlags.ACTIVE, { 1.0f, 1.0f, 1.0f, 1.0f });
+        }
+
+        UnityGreeter.add_style_class (this);
+        try
+        {
+            // Remove the default GtkButton paddings and border
+            var style = new Gtk.CssProvider ();
+            style.load_from_data ("* {padding: 0px 0px 0px 0px; border: 0px; }", -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 enter_notify_event (Gdk.EventCrossing event)
     {
         grab_focus ();
@@ -357,25 +385,32 @@
         return base.leave_notify_event (event);
     }
 
-    public override bool focus_in_event (Gdk.EventFocus event)
-    {
-        i.set_from_file (active_filename);
-        if (l != null)
-            l.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f });
-        return base.focus_in_event (event);
-    }
-
-    public override bool focus_out_event (Gdk.EventFocus event)
-    {
-        i.set_from_file (inactive_filename);
-        if (l != null)
-            l.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 0.0f });
-        return base.focus_out_event (event);
-    }
-
     public override bool draw (Cairo.Context c)
     {
         i.draw (c);
         return true;
     }
+
+    public override void state_flags_changed (Gtk.StateFlags previous_state)
+    {
+        var new_flags = get_state_flags ();
+
+        if ((new_flags & Gtk.StateFlags.PRELIGHT) != 0 && !can_focus ||
+            (new_flags & Gtk.StateFlags.FOCUSED) != 0)
+        {
+            if ((new_flags & Gtk.StateFlags.ACTIVE) != 0 && active_filename != null)
+                i.set_from_file (active_filename);
+            else
+                i.set_from_file (focused_filename);
+        }
+        else
+        {
+            i.set_from_file (inactive_filename);
+        }
+
+        if (l != null)
+            l.set_state_flags (new_flags, true);
+
+        base.state_flags_changed (previous_state);
+    }
 }