Merge lp:~unity-2d-team/unity-2d/wallpaper-based-tinting into lp:unity-2d

[Gerry Boland]

Compute the wallpaper average color and use it to colorize the launcher's, panel's and dash's background. Thanks to Florian Boucault

Compute the wallpaper average color and use it to colorize the launcher's, panel's and dash's background.

[Florian Boucault (fboucault)]

The color computation needs to be refined and checked with the designers.

Interesting references:
http://www.hgrebdes.com/colour/spectrum/colourvisibility.html
http://www.w3.org/TR/AERT#color-contrast

[Albert Astals Cid (aacid)]

I don't know how common this is, but doing pixel for each of the pixels is ultra slow, you should use scanLine instead

[Michał Sawicz (saviq)]

I don't have anything to add to Albert's comment.

review: Approve

[Michał Sawicz (saviq)]

> I don't have anything to add to Albert's comment.
I take that back, I can has tests for that?

review: Needs Fixing

[Jason Smith (jassmith)]

This should have design signoff and screenshots so we can keep UnityQt and Unity in sync

[Jason Smith (jassmith)]

Forgot to mark needs fixing

review: Needs Fixing

[Florian Boucault (fboucault)]

> This should have design signoff and screenshots so we can keep UnityQt and
> Unity in sync

Don't worry, design is always involved.

[Jason Smith (jassmith)]

Design needs to sign off on the review itself before its merged so we can know when to update.

[Jason Smith (jassmith)]

And it still needs screenshots

[Tim Penhey (thumper)]

Florian, please add a review request from the design team, and add before and after pictures so they can see what is going on.

[Florian Boucault (fboucault)]

> Florian, please add a review request from the design team, and add before and
> after pictures so they can see what is going on.

Design has done a prereview of it already. Though the work is not finished on my side. Visual changes in Unity 2D are checked by design.

Do you always put screenshots for visual changes in Unity?

[Jason Smith (jassmith)]

We try to put up screenshots for every design review we do. We are working on improving this across the board and here should be no different. The point of the screenshots is to show visual changes in merge reviews.

[Florian Boucault (fboucault)]

After fiddling with lots of things we landed on the following solution that the design team is happy with.
One shortcoming is that it does not do so well if the windows below are dark (e.g. a terminal) but that's not worse than it was before.

http://people.canonical.com/~kaleo/colorize/before.png
http://people.canonical.com/~kaleo/colorize/after.png

Code wise, it is missing a couple of tests and the rest should be good to go.

[Florian Boucault (fboucault)]

I forgot to mention that this MR depends on https://code.launchpad.net/~fboucault/unity-2d/transparent_panel_when_dash/+merge/92672 that was reviewed and 'approved' but not landed yet due to the freeze.

[Michał Sawicz (saviq)]

This isn't so apparent with your packed launcher, but is that http://ubuntuone.com/4xOyGy4ZQVSxfHCvZdFeOS how the it is supposed to look? Looks too bright to me.

review: Needs Information

[Michał Sawicz (saviq)]

And here with the panel - same issue as with the launcher http://ubuntuone.com/2Y9Dgt1HZP3PDPo4mlGbAr

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/150/console reported an error when processing this lp:~fboucault/unity-2d/wallpaper_average_color branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/151/console reported an error when processing this lp:~fboucault/unity-2d/wallpaper_average_color branch.
Not merging it.

[Tiago Salem Herrmann (tiagosh)]

fails: LC_ALL=C ./imageutilitiestest
works: LC_ALL=C.UTF-8 ./imageutilitiestest

The file "Langelinie_Allé_by_SirPecanGum.jpg" can't be found when using non utf8 environment, even though LANG is en_US.UTF-8

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/153/console reported an error when processing this lp:~fboucault/unity-2d/wallpaper_average_color branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/156/console reported an error when processing this lp:~fboucault/unity-2d/wallpaper_average_color branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/158/console reported an error when processing this lp:~fboucault/unity-2d/wallpaper_average_color branch.
Not merging it.

[Michał Sawicz (saviq)]

Approving again to check if Didier's unity-merger tweak helps.

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity-2d failed due to conflicts:

text conflict in libunity-2d-private/Unity2d/plugin.cpp
text conflict in libunity-2d-private/src/CMakeLists.txt
text conflict in libunity-2d-private/src/panelstyle.cpp
text conflict in libunity-2d-private/src/panelstyle.h
text conflict in libunity-2d-private/tests/CMakeLists.txt
text conflict in shell/launcher/Launcher.qml

[Michał Sawicz (saviq)]

The issues have been resolved, approving.

review: Approve

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2012-03-13 18:54:14 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2012-03-20 17:07:21 +0000
@@ -41,6 +41,7 @@
 #include "desktopinfo.h"
 #include "plugin.h"
 #include "cacheeffect.h"
+#include "colorizeeffect.h"
 #include "iconutilities.h"
 #include "cursorshapearea.h"
 #include "unity2dtr.h"
@@ -81,6 +82,7 @@
 #include "unity2dpanel.h"
 #include "strutmanager.h"
 
+#include "imageutilities.h"
 #include "pointerbarrier.h"
 
 #include <QtDeclarative/qdeclarative.h>
@@ -122,6 +124,7 @@
     qmlRegisterType<WorkspacesInfo>(); // Register the type as non creatable
 
     qmlRegisterType<CacheEffect>(uri, 0, 1, "CacheEffect");
+    qmlRegisterType<ColorizeEffect>("Effects", 0, 1, "ColorizeEffect");
     qmlRegisterType<QGraphicsBlurEffect>("Effects", 1, 0, "Blur");
     qmlRegisterType<QGraphicsColorizeEffect>("Effects", 1, 0, "Colorize");
     qmlRegisterType<QGraphicsDropShadowEffect>("Effects", 1, 0, "DropShadow");
@@ -187,6 +190,8 @@
 
     qmlRegisterType<Unity2dPanel>(uri, 0, 1, "Unity2dPanel");
     qmlRegisterType<StrutManager>(uri, 0, 1, "StrutManager");
+
+    qmlRegisterType<ImageUtilities>(uri, 0, 1, "ImageUtilities");
     
     qmlRegisterType<PointerBarrierWrapper>(uri, 0, 1, "PointerBarrier");
 }
@@ -208,6 +213,7 @@
 
     /* Expose QConf objects as a context property not to initialize it multiple times */
     engine->rootContext()->setContextProperty("unity2dConfiguration", &unity2dConfiguration());
+    engine->rootContext()->setContextProperty("unityConfiguration", &unityConfiguration());
     engine->rootContext()->setContextProperty("launcher2dConfiguration", &launcher2dConfiguration());
     engine->rootContext()->setContextProperty("dash2dConfiguration", &dash2dConfiguration());
 

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2012-03-16 15:47:12 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2012-03-20 17:07:21 +0000
@@ -33,6 +33,7 @@
     screeninfo.cpp
     desktopinfo.cpp
     cacheeffect.cpp
+    colorizeeffect.cpp
     workspacesinfo.cpp
     signalwaiter.cpp
     dragitem.cpp
@@ -82,6 +83,7 @@
     inputshapemask.cpp
     strutmanager.cpp
     utils.cpp
+    imageutilities.cpp
     pointerbarrier.cpp
     pointerbarriermanager.cpp
     decayedvalue.cpp

=== added file 'libunity-2d-private/src/colorizeeffect.cpp'
--- libunity-2d-private/src/colorizeeffect.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/colorizeeffect.cpp	2012-03-20 17:07:21 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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/>.
+ */
+
+#include "colorizeeffect.h"
+
+#include <QPainter>
+
+ColorizeEffect::ColorizeEffect(QObject *parent) :
+    QGraphicsEffect(parent),
+    m_color("black"),
+    m_saturation(1.0)
+{
+}
+
+QColor ColorizeEffect::color() const
+{
+    return m_color;
+}
+
+void ColorizeEffect::setColor(const QColor &color)
+{
+    if (color == m_color) return;
+
+    m_color = color;
+    m_tintedPixmap = QPixmap();
+    update();
+    Q_EMIT colorChanged(color);
+}
+
+qreal ColorizeEffect::saturation() const
+{
+    return m_saturation;
+}
+
+void ColorizeEffect::setSaturation(qreal saturation)
+{
+    if (saturation == m_saturation) return;
+
+    m_saturation = saturation;
+    m_tintedPixmap = QPixmap();
+    update();
+    Q_EMIT saturationChanged(saturation);
+}
+
+void ColorizeEffect::draw(QPainter *painter)
+{
+    QPoint offset;
+    const QPixmap pixmap = sourcePixmap(Qt::DeviceCoordinates, &offset, QGraphicsEffect::NoPad);
+
+    if (m_tintedPixmap.isNull()) {
+        /* Compute the tinted pixmap by composing the source pixmap and a tinted rectangle */
+        m_tintedPixmap = pixmap.copy();
+        QPainter tintedPainter(&m_tintedPixmap);
+        tintedPainter.setRenderHints(painter->renderHints());
+        tintedPainter.setCompositionMode(QPainter::CompositionMode_Overlay);
+        QColor color = m_color;
+        color.setAlphaF(m_saturation);
+        tintedPainter.fillRect(m_tintedPixmap.rect(), color);
+        /* Apply alpha channel of the source pixmap to the tinted pixmap */
+        tintedPainter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+        tintedPainter.drawPixmap(0, 0, pixmap);
+        tintedPainter.end();
+    }
+
+    QTransform previousTransform = painter->worldTransform();
+    painter->setWorldTransform(QTransform());
+    painter->drawPixmap(offset, m_tintedPixmap);
+    painter->setWorldTransform(previousTransform);
+}
+
+void ColorizeEffect::sourceChanged(ChangeFlags flags)
+{
+    m_tintedPixmap = QPixmap();
+}
+
+#include "colorizeeffect.moc"

=== added file 'libunity-2d-private/src/colorizeeffect.h'
--- libunity-2d-private/src/colorizeeffect.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/colorizeeffect.h	2012-03-20 17:07:21 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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/>.
+ */
+
+#ifndef COLORIZEEFFECT_H
+#define COLORIZEEFFECT_H
+
+#include <QGraphicsEffect>
+#include <QColor>
+
+class ColorizeEffect : public QGraphicsEffect
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+    Q_PROPERTY(qreal saturation READ saturation WRITE setSaturation NOTIFY saturationChanged)
+
+public:
+    explicit ColorizeEffect(QObject *parent = 0);
+
+    // getters
+    QColor color() const;
+    qreal saturation() const;
+
+    // setters
+    void setColor(const QColor &color);
+    void setSaturation(qreal saturation);
+
+Q_SIGNALS:
+    void colorChanged(const QColor &color);
+    void saturationChanged(qreal saturation);
+
+protected:
+    void draw(QPainter *painter);
+    void sourceChanged(ChangeFlags flags);
+
+private:
+    QColor m_color;
+    qreal m_saturation;
+
+    // caching of intermediary renderings
+    QPixmap m_tintedPixmap;
+};
+
+#endif // COLORIZEEFFECT_H

=== added file 'libunity-2d-private/src/imageutilities.cpp'
--- libunity-2d-private/src/imageutilities.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/imageutilities.cpp	2012-03-20 17:07:21 +0000
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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/>.
+ */
+
+#include "imageutilities.h"
+
+#include <QImage>
+
+ImageUtilities::ImageUtilities(QObject *parent) :
+    QObject(parent)
+{
+}
+
+QUrl ImageUtilities::source() const
+{
+    return m_source;
+}
+
+QColor ImageUtilities::averageColor() const
+{
+    return m_averageColor;
+}
+
+void ImageUtilities::setSource(const QUrl &source)
+{
+    /* FIXME: should monitor source file for changes */
+    if (source == m_source) return;
+    m_source = source;
+    Q_EMIT sourceChanged();
+
+    QImage image;
+    image.load(source.toLocalFile());
+
+    if (image.isNull()) return;
+
+    QColor averageColor = computeAverageColor(image);
+
+    if (averageColor != m_averageColor) {
+        m_averageColor = averageColor;
+        Q_EMIT averageColorChanged();
+    }
+}
+
+QColor ImageUtilities::computeAverageColor(const QImage& image)
+{
+    long int rtotal = 0, gtotal = 0, btotal = 0;
+    float total = 0.0f;
+    // always sample 100x100 pixels
+    int samplePoints = 100;
+    int stepX = std::max(image.width() / samplePoints, 1);
+    int stepY = std::max(image.height() / samplePoints, 1);
+
+    for (int y = 0; y < image.height(); y += stepY) {
+        for (int x = 0; x < image.width(); x += stepX) {
+            QColor color = QColor::fromRgba(image.pixel(x, y));
+
+            float saturation = (qMax (color.red(), qMax (color.green(), color.blue())) -
+                                qMin (color.red(), qMin (color.green(), color.blue()))) / 255.0f;
+            float relevance = .1 + .9 * (color.alpha() / 255.0f) * saturation;
+
+            rtotal += (unsigned char) (color.red() * relevance);
+            gtotal += (unsigned char) (color.green() * relevance);
+            btotal += (unsigned char) (color.blue() * relevance);
+
+            total += relevance * 255;
+        }
+    }
+
+    QColor hsv = QColor::fromRgbF(rtotal / total, gtotal / total, btotal / total).toHsv();
+
+    /* Background color is the base color with 0.90f HSV value */
+    hsv.setHsvF(hsv.hueF(),
+                (hsv.saturationF() > .15f) ? 0.65f : hsv.saturationF(),
+                0.90f);
+    return hsv;
+}
+
+#include "imageutilities.moc"

=== added file 'libunity-2d-private/src/imageutilities.h'
--- libunity-2d-private/src/imageutilities.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/imageutilities.h	2012-03-20 17:07:21 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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/>.
+ */
+
+#ifndef IMAGEUTILITIES_H
+#define IMAGEUTILITIES_H
+
+#include <QObject>
+#include <QColor>
+#include <QUrl>
+#include <QImage>
+
+class ImageUtilities : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(QColor averageColor READ averageColor NOTIFY averageColorChanged)
+
+public:
+    explicit ImageUtilities(QObject *parent = 0);
+
+    // getters
+    QUrl source() const;
+    QColor averageColor() const;
+
+    // setters
+    void setSource(const QUrl&);
+
+Q_SIGNALS:
+    void sourceChanged();
+    void averageColorChanged();
+
+protected:
+    QColor computeAverageColor(const QImage&);
+
+private:
+    QUrl m_source;
+    QColor m_averageColor;
+};
+
+#endif // IMAGEUTILITIES_H

=== modified file 'libunity-2d-private/src/panelpalettemanager.cpp'
--- libunity-2d-private/src/panelpalettemanager.cpp	2012-03-19 19:36:04 +0000
+++ libunity-2d-private/src/panelpalettemanager.cpp	2012-03-20 17:07:21 +0000
@@ -24,10 +24,12 @@
 #include <hudclient.h>
 #include <panelstyle.h>
 #include <unity2dpanel.h>
+#include <config.h>
 
 // Qt
 #include <QBrush>
 #include <QPalette>
+#include <QVariant>
 
 // GTK
 #include <gtk/gtk.h>
@@ -49,6 +51,7 @@
     connect(HUDClient::instance(), SIGNAL(activeChanged(bool)), this, SLOT(updatePalette()));
     connect(DashClient::instance(), SIGNAL(screenChanged(int)), this, SLOT(updatePalette()));
     connect(HUDClient::instance(), SIGNAL(screenChanged(int)), this, SLOT(updatePalette()));
+    connect(&unityConfiguration(), SIGNAL(averageBgColor(QVariant)), this, SLOT(updatePalette()));
 
     m_gConnector.connect(gtk_settings_get_default(), "notify::gtk-theme-name", G_CALLBACK(onThemeChanged), this);
     updatePalette();
@@ -78,7 +81,11 @@
 
     QPalette pal;
     if (DashClient::instance()->activeInScreen(m_panel->screen()) || HUDClient::instance()->activeInScreen(m_panel->screen())) {
-        pal.setBrush(QPalette::Window, QColor(0, 0, 0, 168));
+        /* The background color is the same as in the launcher */
+        QColor wallpaperColor(unityConfiguration().property("averageBgColor").toString());
+        QColor backgroundColor(wallpaperColor.red(), wallpaperColor.green(), wallpaperColor.blue(), 168);
+        backgroundColor = backgroundColor.darker(800);
+        pal.setBrush(QPalette::Window, backgroundColor);
     } else {
         pal.setBrush(QPalette::Window, generateBackgroundBrush());
     }

=== modified file 'libunity-2d-private/src/percentcoder.cpp'
--- libunity-2d-private/src/percentcoder.cpp	2012-03-13 18:54:14 +0000
+++ libunity-2d-private/src/percentcoder.cpp	2012-03-20 17:07:21 +0000
@@ -39,7 +39,7 @@
 
 void PercentCoder::setEncoded(const QString &string)
 {
-    QString str = QUrl::fromPercentEncoding(string.toAscii());
+    QString str = QUrl::fromPercentEncoding(string.toUtf8());
     if (str != m_string) {
         m_string = str;
         Q_EMIT stringChanged();

=== modified file 'libunity-2d-private/tests/CMakeLists.txt'
--- libunity-2d-private/tests/CMakeLists.txt	2012-03-16 17:15:17 +0000
+++ libunity-2d-private/tests/CMakeLists.txt	2012-03-20 17:07:21 +0000
@@ -38,6 +38,7 @@
     listaggregatormodeltest
     qsortfilterproxymodeltest
     focuspathtest
+    imageutilitiestest
     pointerbarriertest
     hotkeytest
     )

=== added file 'libunity-2d-private/tests/imageutilitiestest.cpp'
--- libunity-2d-private/tests/imageutilitiestest.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/tests/imageutilitiestest.cpp	2012-03-20 17:07:21 +0000
@@ -0,0 +1,97 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * Authors:
+ * - Gerry Boland <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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/>.
+ */
+
+// Local
+#include <unitytestmacro.h>
+#include <debug_p.h>
+#include <imageutilities.h>
+#include <config.h>
+
+const int threshold = 0.001;
+
+class ImageUtilitiesTest : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void initTestCase()
+    {
+    }
+
+    void testAverageColorComputed0()
+    {
+        ImageUtilities imageUtil;
+        QUrl image("file:" + unity2dDirectory() + "/libunity-2d-private/tests/verification/JardinPolar_by_CarmenGloria_Gonzalez.jpg");
+        QColor color;
+
+        imageUtil.setSource(image);
+        color = imageUtil.averageColor();
+
+        QCOMPARE(color.red(), 80);
+        QCOMPARE(color.green(), 194);
+        QCOMPARE(color.blue(), 230);
+    }
+
+    void testAverageColorComputed1()
+    {
+        ImageUtilities imageUtil;
+        QUrl image("file:" + unity2dDirectory() + "/libunity-2d-private/tests/verification/Langelinie_Alle_by_SirPecanGum.jpg");
+        QColor color;
+
+        imageUtil.setSource(image);
+        color = imageUtil.averageColor();
+        QCOMPARE(color.red(), 230);
+        QCOMPARE(color.green(), 126);
+        QCOMPARE(color.blue(), 80);
+    }
+
+    void testAverageColorComputed2()
+    {
+        ImageUtilities imageUtil;
+        QUrl image("file:" + unity2dDirectory() + "/libunity-2d-private/tests/verification/The_Grass_aint_Greener_by_fix_pena.jpg");
+        QColor color;
+
+        imageUtil.setSource(image);
+        color = imageUtil.averageColor();
+
+        QCOMPARE(color.red(), 218);
+        QCOMPARE(color.green(), 230);
+        QCOMPARE(color.blue(), 80);
+    }
+
+    void testAverageColorComputed3()
+    {
+        ImageUtilities imageUtil;
+        QUrl image("file:" + unity2dDirectory() + "/libunity-2d-private/tests/verification/warty-final-ubuntu.png");
+        QColor color;
+
+        imageUtil.setSource(image);
+        color = imageUtil.averageColor();
+
+        QCOMPARE(color.red(), 230);
+        QCOMPARE(color.green(), 80);
+        QCOMPARE(color.blue(), 137);
+    }
+};
+
+UAPP_TEST_MAIN(ImageUtilitiesTest)
+
+#include "imageutilitiestest.moc"
+

=== added directory 'libunity-2d-private/tests/verification'
=== added file 'libunity-2d-private/tests/verification/JardinPolar_by_CarmenGloria_Gonzalez.jpg'
Binary files libunity-2d-private/tests/verification/JardinPolar_by_CarmenGloria_Gonzalez.jpg	1970-01-01 00:00:00 +0000 and libunity-2d-private/tests/verification/JardinPolar_by_CarmenGloria_Gonzalez.jpg	2012-03-20 17:07:21 +0000 differ
=== added file 'libunity-2d-private/tests/verification/Langelinie_Alle_by_SirPecanGum.jpg'
Binary files libunity-2d-private/tests/verification/Langelinie_Alle_by_SirPecanGum.jpg	1970-01-01 00:00:00 +0000 and libunity-2d-private/tests/verification/Langelinie_Alle_by_SirPecanGum.jpg	2012-03-20 17:07:21 +0000 differ
=== added file 'libunity-2d-private/tests/verification/The_Grass_aint_Greener_by_fix_pena.jpg'
Binary files libunity-2d-private/tests/verification/The_Grass_aint_Greener_by_fix_pena.jpg	1970-01-01 00:00:00 +0000 and libunity-2d-private/tests/verification/The_Grass_aint_Greener_by_fix_pena.jpg	2012-03-20 17:07:21 +0000 differ
=== added file 'libunity-2d-private/tests/verification/warty-final-ubuntu.png'
Binary files libunity-2d-private/tests/verification/warty-final-ubuntu.png	1970-01-01 00:00:00 +0000 and libunity-2d-private/tests/verification/warty-final-ubuntu.png	2012-03-20 17:07:21 +0000 differ
=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-03-15 14:12:07 +0000
+++ shell/Shell.qml	2012-03-20 17:07:21 +0000
@@ -39,6 +39,9 @@
 
     Accessible.name: "shell"
 
+    WallpaperColor {
+    }
+
     GestureHandler {
         id: gestureHandler
     }

=== added file 'shell/WallpaperColor.qml'
--- shell/WallpaperColor.qml	1970-01-01 00:00:00 +0000
+++ shell/WallpaperColor.qml	2012-03-20 17:07:21 +0000
@@ -0,0 +1,65 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 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 as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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/>.
+ */
+
+import QtQuick 1.1
+import QConf 1.0
+import Unity2d 1.0
+
+/* Save wallpaper average color in Unity's configuration key 'averageBgColor'
+   FIXME: the case where the wallpaper is a slideshow is not yet supported
+*/
+/* FIXME: change of wallpaper is not taken into account live because of a bug
+   in dconf-dbus. Patch is available and needs to be pushed in Ubuntu.
+   Ref.: https://bugzilla.gnome.org/show_bug.cgi?id=669915
+*/
+Item {
+    QConf {
+        id: desktopBackground
+        schema: "org.gnome.desktop.background"
+    }
+
+    PercentCoder {
+        id: backgroundFilename
+        encoded: desktopBackground.pictureUri
+    }
+
+    ImageUtilities {
+        id: imageUtilities
+        source: {
+            /* FIXME: Because /usr/share/backgrounds/warty-final-ubuntu.png is
+                      actually a jpeg and Qt relies by default on the extension
+                      that particular background fails to load. We workaround
+                      it by having our own symlink with a 'jpg' extension.
+
+               References:
+               https://bugs.launchpad.net/ubuntu/+source/ubuntu-wallpapers/+bug/296538
+               http://bugreports.qt.nokia.com/browse/QTBUG-7276
+            */
+            var filename = backgroundFilename.unencoded /* path is urlencoded */
+            if(filename == "file:///usr/share/backgrounds/warty-final-ubuntu.png")
+                filename = "/usr/share/unity-2d/warty-final-ubuntu.jpg"
+            return filename
+        }
+    }
+
+    Binding {
+        target: unityConfiguration
+        property: "averageBgColor"
+        value: desktopBackground.pictureUri != "" ? imageUtilities.averageColor : desktopBackground.primaryColor
+    }
+}

=== modified file 'shell/common/Background.qml'
--- shell/common/Background.qml	2012-03-14 14:29:05 +0000
+++ shell/common/Background.qml	2012-03-20 17:07:21 +0000
@@ -46,6 +46,16 @@
         anchors.rightMargin: rightBorderThickness
         clip: true
 
+        /* Extra Item seemingly unnecessary but actually useful to avoid a
+           redrawing bug that happens when applying an effect on a clipped item.
+           In this particular case, doing the Colorize on the clipped child item
+           would prevent proper repainting when maximizing then unmaximizing the
+           dash.
+        */
+        effect: ColorizeEffect {
+            color: unityConfiguration.averageBgColor
+            saturation: 0.4
+        }
         Image {
             id: blurredBackground
 
@@ -76,6 +86,7 @@
             anchors.fill: parent
             fillMode: Image.PreserveAspectCrop
             source: "artwork/background_sheen.png"
+            opacity: 0.8
         }
     }
 

=== modified file 'shell/dash/Dash.qml'
--- shell/dash/Dash.qml	2012-03-19 17:14:48 +0000
+++ shell/dash/Dash.qml	2012-03-20 17:07:21 +0000
@@ -18,7 +18,6 @@
 
 import QtQuick 1.1
 import Unity2d 1.0
-import Effects 1.0
 import "../common"
 import "../common/utils.js" as Utils
 

=== modified file 'shell/launcher/Launcher.qml'
--- shell/launcher/Launcher.qml	2012-03-14 08:21:58 +0000
+++ shell/launcher/Launcher.qml	2012-03-20 17:07:21 +0000
@@ -62,12 +62,13 @@
         }
     }
 
+    /* The background color is the same as in the panel */
     Rectangle {
         Accessible.name: "background"
         anchors.fill: parent
         anchors.rightMargin: Utils.isLeftToRight() && !border.visible ? border.width : 0
         anchors.leftMargin:  Utils.isRightToLeft() && !border.visible ? border.width : 0
-        color: "black"
+        color: Qt.darker(unityConfiguration.averageBgColor, 8.0)
         opacity: 0.66
         visible: desktop.isCompositingManagerRunning
     }