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

[Florian Boucault]

[spread] Windows and background are now limited in size to 512 which saves video
memory when using the OpenGL backend and can improve overall performance.

[Ugo Riboni (uriboni)]

The idea and the code are good, but when testing it gnome-terminal windows appear very pixelated when zooming in and out, and it's not pleasant at all to see.

review: Needs Fixing

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

619. By Florian Boucault on 2011-12-07

Merged lp:unity-2d

620. By Florian Boucault on 2011-12-07

Removed unused code, reduced diff and simplified comments.

Unmerged revisions

620. By Florian Boucault on 2011-12-07

Removed unused code, reduced diff and simplified comments.

619. By Florian Boucault on 2011-12-07

Merged lp:unity-2d

618. By Florian Boucault on 2011-07-11

[spread] Windows and background are now limited in size to 512 which saves video
memory when using the OpenGL backend and can improve overall performance.

=== modified file 'libunity-2d-private/Unity2d/GnomeBackground.qml'
--- libunity-2d-private/Unity2d/GnomeBackground.qml	2011-06-23 17:08:53 +0000
+++ libunity-2d-private/Unity2d/GnomeBackground.qml	2011-07-11 10:38:10 +0000
@@ -85,6 +85,12 @@
         }
         width: screen.geometry.width
         height: screen.geometry.height
+        /* Limit the size of the background thus:
+           - saving video memory when using the OpenGL backend
+           - making scaling cheaper in the spread when using the raster backend
+        */
+        sourceSize.width: 512
+        sourceSize.height: 0
 
         smooth: true
         x: screen.availableGeometry.x

=== modified file 'libunity-2d-private/Unity2d/windowimageprovider.cpp'
--- libunity-2d-private/Unity2d/windowimageprovider.cpp	2011-04-28 13:09:25 +0000
+++ libunity-2d-private/Unity2d/windowimageprovider.cpp	2011-07-11 10:38:10 +0000
@@ -129,7 +129,17 @@
 
     if (!image.isNull()) {
         if (requestedSize.isValid()) {
-            image = image.scaled(requestedSize);
+            /* If the image's actual size is larger than the sourceSize, the
+               image is scaled down. If only one dimension of the size is set
+               to greater than 0, the other dimension is set in proportion to
+               preserve the source image's aspect ratio. */
+            if (requestedSize.width() == 0) {
+                image = image.scaledToHeight(requestedSize.height());
+            } else if (requestedSize.height() == 0) {
+                image = image.scaledToHeight(requestedSize.width());
+            } else {
+                image = image.scaled(requestedSize, Qt::KeepAspectRatio);
+            }
         }
         size->setWidth(image.width());
         size->setHeight(image.height());

=== modified file 'spread/Window.qml'
--- spread/Window.qml	2011-06-23 17:08:53 +0000
+++ spread/Window.qml	2011-07-11 10:38:10 +0000
@@ -79,6 +79,14 @@
                                   + windowInfo.contentXid + "@"
                                   + screen.currentTime()
 
+        /* The window is scaled to a rectangle as large as possible inside
+           sourceSize while preserving its aspect ratio.
+           It saves video memory when using the OpenGL backend.
+           It makes scaling cheaper in the spread when using the raster backend.
+        */
+        sourceSize.width: 512
+        sourceSize.height: 512
+
         /* Disabled during animations for performance reasons */
         smooth: !animating