Merge lp:~fboucault/unity-2d/blueish_images into lp:unity-2d/3.0

[Florian Boucault]

[lp:~fboucault/unity-2d/blueish_images]

369. By Florian Boucault on 2011-01-18

Synchronised comment in places.cpp with spread.cpp.

[Ricardo Salveti (rsalveti)]

Minor changes and work as expected.

The packaging bits from this branch is broken, but after fixing and testing on Efika I'm no longer getting blueish pixmaps when using spread.

review: Approve (code functional)

[Florian Boucault (fboucault)]

@Ricardo, what do you mean by "packaging bits from this branch is broken"?
It is very important that packaging keeps working.

[Florian Boucault (fboucault)]

@Ricardo, this is the wrong merge request, please see https://code.launchpad.net/~fboucault/unity-2d/blueish_images/+merge/46565

Unmerged revisions

=== modified file 'launcher/LauncherItem.qml'
--- launcher/LauncherItem.qml	2010-12-01 12:57:57 +0000
+++ launcher/LauncherItem.qml	2011-01-18 03:46:54 +0000
@@ -101,8 +101,8 @@
         Image {
             id: icon
 
-            width: 30
-            height: 30
+            width: 32
+            height: 32
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
             fillMode: Image.PreserveAspectFit

=== modified file 'places/app/places.cpp'
--- places/app/places.cpp	2011-01-14 20:41:49 +0000
+++ places/app/places.cpp	2011-01-18 03:46:54 +0000
@@ -114,13 +114,13 @@
 {
     /* Forcing graphics system to 'raster' instead of the default 'native'
        which on X11 is 'XRender'.
-       'XRender' defaults to using a TrueColor visual. We mimick that behaviour
-       with 'raster' by calling QApplication::setColorSpec.
+       'XRender' defaults to using a TrueColor visual. We do _not_ mimick that
+       behaviour with 'raster' by calling QApplication::setColorSpec because
+       of a bug where some pixmaps become blueish:
 
        Reference: https://bugs.launchpad.net/upicek/+bug/674484
     */
     QApplication::setGraphicsSystem("raster");
-    QApplication::setColorSpec(QApplication::ManyColor);
     QApplication application(argc, argv);
 
     DashDeclarativeView view;

=== modified file 'spread/app/spread.cpp'
--- spread/app/spread.cpp	2011-01-14 20:41:34 +0000
+++ spread/app/spread.cpp	2011-01-18 03:46:54 +0000
@@ -37,13 +37,13 @@
 
     /* Forcing graphics system to 'raster' instead of the default 'native'
        which on X11 is 'XRender'.
-       'XRender' defaults to using a TrueColor visual. We mimick that behaviour
-       with 'raster' by calling QApplication::setColorSpec.
+       'XRender' defaults to using a TrueColor visual. We do _not_ mimick that
+       behaviour with 'raster' by calling QApplication::setColorSpec because
+       of a bug where some pixmaps become blueish:
 
-       Reference: https://bugs.launchpad.net/upicek/+bug/674484
+       https://bugs.launchpad.net/unity-2d/+bug/689877
     */
     QApplication::setGraphicsSystem("raster");
-    QApplication::setColorSpec(QApplication::ManyColor);
     QApplication application(argc, argv);
 
     SpreadView view;