Merge lp:~3v1n0/unity-greeter/shutdown-average-color-bg into lp:unity-greeter

[Marco Trevisan (Treviño)]

ShutdownDialog: use the average color as source when drawing the background

Use the background average color for generating the background color of the shutdown dialogue. Also set the average color for static backgrounds.

[Robert Ancell (robert-ancell)]

This should be in BackgroundLoader.load:
8 + if (current_background[0] == '#' && current_background.length <= 7)
9 + {
10 + Gdk.Color c;
11 + Gdk.Color.parse (current_background, out c);
12 + current.average_color = {c.red/65535.0f, c.green/65535.0f, c.blue/65535.0f, 1.0f};
13 + }

You should probably use a property instead of a method for get_average_color (), i.e.

public Gdk.RGBA average_color
{
    get { return current.average_color; }
}

review: Needs Fixing

[Robert Ancell (robert-ancell)]

Functionality wise works great!

[lp:~3v1n0/unity-greeter/shutdown-average-color-bg]

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

Background: make average_color a read-only property

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

Background: move the hackish color parsing to the proper place into the Loader

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

> This should be in BackgroundLoader.load:
> 8 + if (current_background[0] == '#' && current_background.length <= 7)
> 9 + {
> 10 + Gdk.Color c;
> 11 + Gdk.Color.parse (current_background, out c);
> 12 + current.average_color = {c.red/65535.0f, c.green/65535.0f,
> c.blue/65535.0f, 1.0f};
> 13 + }

Right... It was just an hack for my tests, then I left it there without noticing that it was just about to add one line into the loader... :)

> You should probably use a property instead of a method for get_average_color

As you prefer...

Fixed both.

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'src/background.vala'
--- src/background.vala	2013-08-14 00:42:48 +0000
+++ src/background.vala	2013-11-13 03:43:52 +0000
@@ -73,6 +73,8 @@
             var pattern = new Cairo.Pattern.rgba (color.red, color.green, color.blue, color.alpha);
             for (var i = 0; i < widths.length; i++)
                 patterns[i] = pattern;
+
+            average_color = color;
             finished = true;
             debug ("Render of background %s complete", filename);
             return true;
@@ -386,6 +388,7 @@
     public string? current_background { get; set; default = null; }
     public bool draw_grid { get; set; default = true; }
     public double alpha { get; private set; default = 1.0; }
+    public Gdk.RGBA average_color { get { return current.average_color; } }
 
     private Cairo.Surface target_surface;
 

=== modified file 'src/main-window.vala'
--- src/main-window.vala	2013-11-05 04:14:44 +0000
+++ src/main-window.vala	2013-11-13 03:43:52 +0000
@@ -342,7 +342,7 @@
         /* Stop input to login box */
         login_box.sensitive = false;
 
-        shutdown_dialog = new ShutdownDialog (type);
+        shutdown_dialog = new ShutdownDialog (type, background.average_color);
         shutdown_dialog.visible = true;
         shutdown_dialog.close.connect (close_shutdown_dialog);
         background.add (shutdown_dialog);

=== modified file 'src/shutdown-dialog.vala'
--- src/shutdown-dialog.vala	2013-11-13 03:43:52 +0000
+++ src/shutdown-dialog.vala	2013-11-13 03:43:52 +0000
@@ -47,8 +47,12 @@
     private Gtk.EventBox monitor_events;
     private Gtk.EventBox vbox_events;
 
-    public ShutdownDialog (ShutdownDialogType type)
+    private Gdk.RGBA avg_color;
+
+    public ShutdownDialog (ShutdownDialogType type, Gdk.RGBA average_color)
     {
+        this.avg_color = average_color;
+
         // This event box covers the monitor size, and closes the dialog on click.
         monitor_events = new Gtk.EventBox ();
         monitor_events.visible = true;
@@ -327,7 +331,9 @@
 
         /* Background */
         DashBox.cairo_rounded_rectangle (c, 20, 20, width - 40, height - 40, 4);
-        c.set_source_rgba (0, 0, 0, 0.75);
+        c.set_source_rgba (0.0, 0.0, 0.0, 0.75f);
+        c.fill_preserve ();
+        c.set_source_rgba (avg_color.red, avg_color.green, avg_color.blue, 0.35);
         c.fill ();
 
         c.restore ();