Merge lp:~fboucault/unity-2d/fix_background_color into lp:unity-2d/0.4

[Florian Boucault]

GnomeBackground: fixed 'wallpaper' and 'scaled' modes (cf. launchpad bug #689531).

'wallpaper' was broken because the sourceSize was set and taken into account even
if the image's size was smaller (http://bugreports.qt.nokia.com/browse/QTBUG-16860).
Thanks to the newly introduced CacheEffect, there is no need to prescale the Image
anymore therefore using sourceSize can be avoided. Unfortunately BlendedImageProvider
was failing if sourceSize was unset. This is now fixed.

'scaled' was broken because the background color was invisible whenever the image
was visible. This optimization is no longer necessary thanks to the CacheEffect.

[Ugo Riboni (uriboni)]

Florian, please hold on on this merge for a bit. I noticed a few issues with CacheEffect after i merged it from trunk into the workspaces switcher branch.
It seems to not work very well while the size is animated. It leaves "trails" of the previous size behind (as if the rendering didn't clear the previous frame before drawing the new one)

[Ugo Riboni (uriboni)]

Setting as approved as the issue affects only animated usage of the CacheEffect, which isn't happening here.

review: Approve

=== modified file 'places/GnomeBackground.qml'
--- places/GnomeBackground.qml	2011-01-20 04:29:08 +0000
+++ places/GnomeBackground.qml	2011-01-24 09:48:29 +0000
@@ -34,7 +34,6 @@
 
         anchors.fill: parent
         color: primary_color.value
-        visible: !picture.visible
     }
 
     Image {
@@ -62,7 +61,8 @@
         }
         width: dashView.screenGeometry.width
         height: dashView.screenGeometry.height
-        sourceSize.width: width
+
+        smooth: true
         x: -dashView.availableGeometry.x
         y: -dashView.availableGeometry.y
 
@@ -83,7 +83,7 @@
                 return Image.Stretch
             else if(picture_options.value == "zoom")
                 return Image.PreserveAspectCrop
-            else return Image.Tile
+            else return Image.PreserveAspectFit
         }
     }
 }

=== modified file 'places/UnityPlaces/blendedimageprovider.cpp'
--- places/UnityPlaces/blendedimageprovider.cpp	2011-01-15 01:41:03 +0000
+++ places/UnityPlaces/blendedimageprovider.cpp	2011-01-24 09:48:29 +0000
@@ -47,8 +47,6 @@
         image = image.scaledToWidth(requestedSize.width(), Qt::SmoothTransformation);
     else if(requestedSize.isValid())
         image = image.scaled(requestedSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-    else
-        return QImage();
 
     if(size)
         *size = image.size();

=== modified file 'spread/GnomeBackground.qml'
--- spread/GnomeBackground.qml	2011-01-20 04:29:08 +0000
+++ spread/GnomeBackground.qml	2011-01-24 09:48:29 +0000
@@ -34,7 +34,6 @@
 
         anchors.fill: parent
         color: primary_color.value
-        visible: !picture.visible
     }
 
     Image {
@@ -62,7 +61,8 @@
         }
         width: screenGeometry.width
         height: screenGeometry.height
-        sourceSize.width: width
+
+        smooth: true
         x: -availableGeometry.x
         y: -availableGeometry.y
 
@@ -83,7 +83,7 @@
                 return Image.Stretch
             else if(picture_options.value == "zoom")
                 return Image.PreserveAspectCrop
-            else return Image.Tile
+            else return Image.PreserveAspectFit
         }
     }
 }