Merge lp:~muktupavels/unity-greeter/lp1423542 into lp:unity-greeter

[Alberts Muktupāvels]

Update unity-greeter so it is possible to style buttons in greeter with css. (LP: #1423542)

Update unity-greeter so it is possible to style buttons in greeter with css. (LP: #1423542)

[Alberts Muktupāvels (muktupavels)]

Related branch:
https://code.launchpad.net/~albertsmuktupavels/ubuntu-themes/lp1423542

[Dmitry Shachnev (mitya57)]

LGTM

review: Approve

[Robert Ancell (robert-ancell)]

Lars - can you confirm this is the right way to do this?

[Lars Karlitski (larsu)]

It is indeed. Very neat. Thanks Alberts.

review: Approve

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'src/flat-button.vala'
--- src/flat-button.vala	2014-11-29 12:14:09 +0000
+++ src/flat-button.vala	2015-02-19 13:15:49 +0000
@@ -39,13 +39,6 @@
         }
     }
 
-    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 bool button_press_event (Gdk.EventButton event)
     {
         // Do nothing.  The normal handler sets priv->button_down which

=== modified file 'src/prompt-box.vala'
--- src/prompt-box.vala	2014-12-17 07:12:01 +0000
+++ src/prompt-box.vala	2015-02-19 13:15:49 +0000
@@ -201,6 +201,7 @@
         name_grid.attach (align, COL_NAME_MESSAGE, ROW_NAME, 1, 1);
 
         option_button = new FlatButton ();
+        option_button.get_style_context ().add_class ("option-button");
         option_button.hexpand = true;
         option_button.halign = Gtk.Align.END;
         option_button.valign = Gtk.Align.START;
@@ -212,16 +213,7 @@
         option_button.clicked.connect (option_button_clicked_cb);
         option_image = new CachedImage (null);
         option_image.show ();
-        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);
 

=== modified file 'src/toggle-box.vala'
--- src/toggle-box.vala	2013-11-12 03:27:13 +0000
+++ src/toggle-box.vala	2015-02-19 13:15:49 +0000
@@ -66,15 +66,20 @@
     private void select (Gtk.Button button)
     {
         if (selected_button != null)
+        {
             selected_button.relief = Gtk.ReliefStyle.NONE;
+            selected_button.get_style_context ().remove_class ("selected");
+        }
         selected_button = button;
         selected_button.relief = Gtk.ReliefStyle.NORMAL;
+        selected_button.get_style_context ().add_class ("selected");
         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.get_style_context ().add_class ("toggle-button");
         item.relief = Gtk.ReliefStyle.NONE;
         item.clicked.connect (button_clicked_cb);