Merge lp:~unity-2d-team/unity-2d/real-transparency into lp:unity-2d/3.0

[Ugo Riboni]

[dash][launcher] Implement real transparency when there's a compositor running.

This branch implements real transparency in the launcher and dash when a compositing manager is active.

The opacity of the transparency may be off and need to be double checked.

Please also note that I put in some fixes in the GnomeBackground QML class, which now is not tied anymore to a specific view (it is still copied in two places, but it's easier to merge into a plugin when we decide to do that).

There's also a fix for performance, so that the fake background is only loaded when the compositor is not running.

Finally, please note that the bug regarding slideshow backgrounds (703574) is fixed by this patch only when compositing mode is running. The fake transparency code still has the issue.
I suppose it can be fixed in the fake transparency case by taking the screenshot of the Nautilus desktop window, but then it would need to look for damage events on that window and update, and I didn't have time to implement that solution yet.

[Florian Boucault (fboucault)]

The panel exhibits visual artifacts. See http://people.canonical.com/~kaleo/transparency_bugs.png

review: Needs Fixing

[Florian Boucault (fboucault)]

The background of the launcher used to have a one pixel line on its right. It is important to the visual design.

review: Needs Fixing

[Florian Boucault (fboucault)]

The spread used to have a few pixels of separation between each workspace.

review: Needs Fixing

[Florian Boucault (fboucault)]

The spread performance is highly hampered with that patch. Going in and out of the spread is sluggish (quite more than before).

review: Needs Fixing

[Ugo Riboni (uriboni)]

The revisions I just pushed should have put back the space between the workspaces in the spread, and fixed the performance regression.

I also put back the border in the launcher. I'm not sure if the way I did it was the most efficient. I also thought of using a 1px wide Rectangle, but went for the tiled pixel for now. Should be easy to change if you think it's better the other way around.

Finally I could not reproduce the corruption in the panel. I am unsure what may cause it since as you can see I don't touch anything in the panel.

[Florian Boucault (fboucault)]

Everything is good to go now :)

review: Approve

=== modified file 'debian/libunity-2d-private0.install'
--- debian/libunity-2d-private0.install	2011-02-02 16:57:00 +0000
+++ debian/libunity-2d-private0.install	2011-06-06 17:26:28 +0000
@@ -1,3 +1,4 @@
 usr/lib/libunity-2d-private.so.*
 usr/lib/qt4/imports/Unity2d/libunity-2d-private-qml.so
 usr/lib/qt4/imports/Unity2d/qmldir
+usr/lib/qt4/imports/Unity2d/*.qml
 
=== modified file 'launcher/Launcher.qml'
--- launcher/Launcher.qml	2011-05-11 10:29:54 +0000
+++ launcher/Launcher.qml	2011-06-06 17:26:28 +0000
@@ -23,10 +23,26 @@
 DropItem {
     id: launcher
 
+    GnomeBackground {
+        anchors.fill: parent
+        overlay_color: "black"
+        overlay_alpha: 0.66
+        visible: !screen.isCompositingManagerRunning
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: "black"
+        opacity: 0.66
+        visible: screen.isCompositingManagerRunning
+    }
+    
     Image {
-        id: background
+        id: border
 
-        anchors.fill: parent
+        width: 1
+        height: parent.height
+        anchors.right: parent.right
         fillMode: Image.TileVertically
         source: "artwork/background.png"
     }
 
=== modified file 'launcher/app/launcher.cpp'
--- launcher/app/launcher.cpp	2011-06-06 09:23:48 +0000
+++ launcher/app/launcher.cpp	2011-06-06 17:26:28 +0000
@@ -106,7 +106,7 @@
     Unity2dTr::init("unity-2d", INSTALL_PREFIX "/share/locale");
 
     /* Panel containing the QML declarative view */
-    Unity2dPanel panel;
+    Unity2dPanel panel(true);
     panel.setEdge(Unity2dPanel::LeftEdge);
     panel.setFixedWidth(LauncherClient::MaximumWidth);
 
@@ -116,9 +116,6 @@
     LauncherView *launcherView = new LauncherView(&panel);
     launcherView->setUseOpenGL(arguments.contains("-opengl"));
 
-    /* FIXME: possible optimisations */
-//    launcherView->setAttribute(Qt::WA_OpaquePaintEvent);
-//    launcherView->setAttribute(Qt::WA_NoSystemBackground);
     launcherView->setResizeMode(QDeclarativeView::SizeRootObjectToView);
     launcherView->setFocus();
 
 
=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-05-30 18:46:16 +0000
+++ launcher/app/launcherview.cpp	2011-06-06 17:26:28 +0000
@@ -61,6 +61,14 @@
     Unity2DDeclarativeView(parent),
     m_superKeyPressed(false), m_superKeyHeld(false)
 {
+    if (QX11Info::isCompositingManagerRunning()) {
+        setAttribute(Qt::WA_TranslucentBackground);
+        viewport()->setAttribute(Qt::WA_TranslucentBackground);
+    } else {
+        setAttribute(Qt::WA_OpaquePaintEvent);
+        setAttribute(Qt::WA_NoSystemBackground);
+    }
+
     m_superKeyHoldTimer.setSingleShot(true);
     m_superKeyHoldTimer.setInterval(KEY_HOLD_THRESHOLD);
     connect(&m_superKeyHoldTimer, SIGNAL(timeout()), SLOT(updateSuperKeyHoldState()));
 
=== modified file 'launcher/artwork/background.png'
 Binary files launcher/artwork/background.png	2011-02-09 19:32:23 +0000 and launcher/artwork/background.png	2011-06-06 17:26:28 +0000 differ
=== modified file 'libunity-2d-private/Unity2d/CMakeLists.txt'
--- libunity-2d-private/Unity2d/CMakeLists.txt	2011-05-18 15:47:16 +0000
+++ libunity-2d-private/Unity2d/CMakeLists.txt	2011-06-06 17:26:28 +0000
@@ -34,6 +34,8 @@
     dropitem.h
     )
 
+file(GLOB unity-2d-private-qml_QML *.qml)
+
 qt4_wrap_cpp(unity-2d-private-qml_MOC_SRCS ${unity-2d-private-qml_MOC_HDRS})
 
 # Build
@@ -65,7 +67,7 @@
     LIBRARY DESTINATION ${IMPORT_INSTALL_DIR}
     )
 
-install(FILES qmldir
+install(FILES qmldir ${unity-2d-private-qml_QML}
     DESTINATION ${IMPORT_INSTALL_DIR}
     )
 
 
=== added file 'libunity-2d-private/Unity2d/GnomeBackground.qml'
--- libunity-2d-private/Unity2d/GnomeBackground.qml	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/Unity2d/GnomeBackground.qml	2011-06-06 17:26:28 +0000
@@ -0,0 +1,113 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010-2011 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 Qt 4.7
+import gconf 1.0
+/* Necessary to access the blended image provider and CacheEffect */
+import Unity2d 1.0
+
+Item {
+    property string overlay_color
+    property real overlay_alpha
+    
+    /* Avoid redraw at rendering */
+    CacheEffect {
+        id: cacheEffect
+    }
+    property bool cached: true
+    effect: (cached) ? cacheEffect : null
+
+    GConfItem {
+        id: primary_color
+        key: "/desktop/gnome/background/primary_color"
+    }
+
+    GConfItem {
+        id: picture_filename
+        key: "/desktop/gnome/background/picture_filename"
+    }
+
+    GConfItem {
+        id: picture_options
+        key: "/desktop/gnome/background/picture_options"
+    }
+
+    Rectangle {
+        Rectangle {
+            anchors.fill: parent
+            opacity: overlay_alpha
+            color: overlay_color
+        }
+
+        anchors.fill: parent
+        color: primary_color.value
+    }
+
+    Image {
+        id: picture
+
+        visible: picture_filename.value
+        source: {
+            if (!visible) return ""
+            
+            /* 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 = picture_filename.value
+            if(filename == "/usr/share/backgrounds/warty-final-ubuntu.png")
+                filename = engineBaseUrl + "artwork/warty-final-ubuntu.jpg"
+
+            if(overlay_alpha > 0.0)
+                return "image://blended/%1color=%2alpha=%3".arg(filename).arg(overlay_color).arg(overlay_alpha)
+            else
+                return filename
+        }
+        width: screen.geometry.width
+        height: screen.geometry.height
+
+        smooth: true
+        x: screen.availableGeometry.x
+        y: -screen.availableGeometry.y
+
+        /* Possible modes are:
+            - "wallpaper"
+            - "centered" (NOT IMPLEMENTED)
+            - "scaled"
+            - "stretched"
+            - "zoom"
+            - "spanned" (NOT IMPLEMENTED)
+        */
+        fillMode: {
+            if(picture_options.value == "wallpaper")
+                return Image.Tile
+            else if(picture_options.value == "scaled")
+                return Image.PreserveAspectFit
+            else if(picture_options.value == "stretched")
+                return Image.Stretch
+            else if(picture_options.value == "zoom")
+                return Image.PreserveAspectCrop
+            else return Image.PreserveAspectFit
+        }
+    }
+}
 
=== modified file 'libunity-2d-private/Unity2d/qmldir'
--- libunity-2d-private/Unity2d/qmldir	2011-02-02 16:57:00 +0000
+++ libunity-2d-private/Unity2d/qmldir	2011-06-06 17:26:28 +0000
@@ -1,1 +1,3 @@
 plugin unity-2d-private-qml
+
+GnomeBackground 1.0 GnomeBackground.qml
 
=== modified file 'libunity-2d-private/Unity2d/screeninfo.cpp'
--- libunity-2d-private/Unity2d/screeninfo.cpp	2011-02-08 12:34:50 +0000
+++ libunity-2d-private/Unity2d/screeninfo.cpp	2011-06-06 17:26:28 +0000
@@ -93,3 +93,8 @@
         Q_EMIT availableGeometryChanged(availableGeometry());
     }
 }
+
+bool ScreenInfo::isCompositingManagerRunning() const
+{
+    return QX11Info::isCompositingManagerRunning();
+}
 
=== modified file 'libunity-2d-private/Unity2d/screeninfo.h'
--- libunity-2d-private/Unity2d/screeninfo.h	2011-02-08 12:34:50 +0000
+++ libunity-2d-private/Unity2d/screeninfo.h	2011-06-06 17:26:28 +0000
@@ -21,6 +21,8 @@
     Q_PROPERTY(unsigned int activeWindow READ activeWindow NOTIFY activeWindowChanged)
     Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged)
     Q_PROPERTY(QRect availableGeometry READ availableGeometry NOTIFY availableGeometryChanged)
+    Q_PROPERTY(bool isCompositingManagerRunning READ isCompositingManagerRunning
+                                                NOTIFY isCompositingManagerRunningChanged)
 
 public:
     static ScreenInfo* instance();
@@ -35,12 +37,14 @@
     unsigned int activeWindow() const { return m_activeWindow; }
     QRect availableGeometry() const;
     QRect geometry() const;
+    bool isCompositingManagerRunning() const;
 
 Q_SIGNALS:
     void activeWindowChanged(unsigned int activeWindow);
     void geometryChanged(QRect geometry);
     void availableGeometryChanged(QRect availableGeometry);
     void workspacesChanged(WorkspacesInfo *workspaces);
+    void isCompositingManagerRunningChanged(bool);
 
 private:
     explicit ScreenInfo(QObject *parent = 0);
 
=== modified file 'libunity-2d-private/src/unity2dpanel.cpp'
--- libunity-2d-private/src/unity2dpanel.cpp	2011-05-25 10:18:52 +0000
+++ libunity-2d-private/src/unity2dpanel.cpp	2011-06-06 17:26:28 +0000
@@ -131,7 +131,7 @@
     }
 };
 
-Unity2dPanel::Unity2dPanel(QWidget* parent)
+Unity2dPanel::Unity2dPanel(bool requiresTransparency, QWidget* parent)
 : QWidget(parent)
 , d(new Unity2dPanelPrivate)
 {
@@ -158,7 +158,13 @@
 
     setAttribute(Qt::WA_X11NetWmWindowTypeDock);
     setAttribute(Qt::WA_Hover);
-    setAutoFillBackground(true);
+
+    if (QX11Info::isCompositingManagerRunning() && requiresTransparency) {
+        setAttribute(Qt::WA_TranslucentBackground);
+    } else {
+        setAutoFillBackground(true);
+    }
+    
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), SLOT(slotWorkAreaResized(int)));
 }
 
 
=== modified file 'libunity-2d-private/src/unity2dpanel.h'
--- libunity-2d-private/src/unity2dpanel.h	2011-02-20 23:58:30 +0000
+++ libunity-2d-private/src/unity2dpanel.h	2011-06-06 17:26:28 +0000
@@ -50,7 +50,7 @@
         TopEdge
     };
 
-    Unity2dPanel(QWidget* parent = 0);
+    Unity2dPanel(bool requiresTransparency = false, QWidget* parent = 0);
     ~Unity2dPanel();
 
     void setEdge(Edge);
 
=== removed file 'places/GnomeBackground.qml'
--- places/GnomeBackground.qml	2011-03-22 06:15:19 +0000
+++ places/GnomeBackground.qml	1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2010-2011 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 Qt 4.7
-import gconf 1.0
-/* Necessary to access the blended image provider and CacheEffect */
-import Unity2d 1.0
-
-Item {
-    property string overlay_color
-    property real overlay_alpha
-
-    /* Avoid redraw at rendering */
-    effect: CacheEffect {}
-
-    GConfItem {
-        id: primary_color
-        key: "/desktop/gnome/background/primary_color"
-    }
-
-    GConfItem {
-        id: picture_filename
-        key: "/desktop/gnome/background/picture_filename"
-    }
-
-    GConfItem {
-        id: picture_options
-        key: "/desktop/gnome/background/picture_options"
-    }
-
-    Rectangle {
-        Rectangle {
-            anchors.fill: parent
-            opacity: overlay_alpha
-            color: overlay_color
-        }
-
-        anchors.fill: parent
-        color: primary_color.value
-    }
-
-    Image {
-        id: picture
-
-        visible: picture_filename.value
-        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 = picture_filename.value
-            if(filename == "/usr/share/backgrounds/warty-final-ubuntu.png")
-                filename = engineBaseUrl + "artwork/warty-final-ubuntu.jpg"
-
-            if(overlay_alpha > 0.0)
-                return "image://blended/%1color=%2alpha=%3".arg(filename).arg(overlay_color).arg(overlay_alpha)
-            else
-                return filename
-        }
-        width: dashView.screenGeometry.width
-        height: dashView.screenGeometry.height
-
-        smooth: true
-        x: -dashView.availableGeometry.x
-        y: -dashView.availableGeometry.y
-
-        /* Possible modes are:
-            - "wallpaper"
-            - "centered" (NOT IMPLEMENTED)
-            - "scaled"
-            - "stretched"
-            - "zoom"
-            - "spanned" (NOT IMPLEMENTED)
-        */
-        fillMode: {
-            if(picture_options.value == "wallpaper")
-                return Image.Tile
-            else if(picture_options.value == "scaled")
-                return Image.PreserveAspectFit
-            else if(picture_options.value == "stretched")
-                return Image.Stretch
-            else if(picture_options.value == "zoom")
-                return Image.PreserveAspectCrop
-            else return Image.PreserveAspectFit
-        }
-    }
-}
 
=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2011-04-29 16:26:25 +0000
+++ places/app/dashdeclarativeview.cpp	2011-06-06 17:26:28 +0000
@@ -369,12 +369,6 @@
 }
 
 bool
-DashDeclarativeView::isCompositingManagerRunning() const
-{
-    return QX11Info::isCompositingManagerRunning();
-}
-
-bool
 DashDeclarativeView::connectToBus()
 {
     bool ok = QDBusConnection::sessionBus().registerService(DASH_DBUS_SERVICE);
 
=== modified file 'places/app/dashdeclarativeview.h'
--- places/app/dashdeclarativeview.h	2011-04-29 16:26:25 +0000
+++ places/app/dashdeclarativeview.h	2011-06-06 17:26:28 +0000
@@ -33,7 +33,6 @@
     Q_PROPERTY(QString activePlaceEntry READ activePlaceEntry WRITE setActivePlaceEntry NOTIFY activePlaceEntryChanged)
     Q_PROPERTY(QRect screenGeometry READ screenGeometry NOTIFY screenGeometryChanged)
     Q_PROPERTY(QRect availableGeometry READ availableGeometry NOTIFY availableGeometryChanged)
-    Q_PROPERTY(bool isCompositingManagerRunning READ isCompositingManagerRunning NOTIFY isCompositingManagerRunningChanged)
 
 public:
     enum DashMode {
@@ -50,7 +49,6 @@
     const QRect screenGeometry() const;
     QRect availableGeometry() const;
     bool expanded() const;
-    bool isCompositingManagerRunning() const;
 
     /* setters */
     Q_SLOT void setActive(bool active);
@@ -71,7 +69,6 @@
 
     void screenGeometryChanged();
     void availableGeometryChanged();
-    void isCompositingManagerRunningChanged(bool);
 
 protected:
     void resizeEvent(QResizeEvent*);
 
=== modified file 'places/dash.qml'
--- places/dash.qml	2011-05-11 12:57:59 +0000
+++ places/dash.qml	2011-06-06 17:26:28 +0000
@@ -19,6 +19,7 @@
 import Qt 4.7
 import UnityApplications 1.0 /* Necessary for LauncherPlacesList */
 import Places 1.0 /* Necessary for DashDeclarativeView.*Dash */
+import Unity2d 1.0 /* Necessary for GnomeBackground */
 
 Item {
     id: dash
@@ -86,21 +87,21 @@
     GnomeBackground {
         anchors.fill: parent
         overlay_color: "black"
-        overlay_alpha: 0.71
-        visible: dashView.dashMode == DashDeclarativeView.FullScreenMode && !dashView.isCompositingManagerRunning
+        overlay_alpha: 0.89
+        visible: dashView.dashMode == DashDeclarativeView.FullScreenMode && !screen.isCompositingManagerRunning
     }
 
     Rectangle {
         anchors.fill: parent
         color: "black"
-        opacity: 0.69
-        visible: dashView.dashMode == DashDeclarativeView.FullScreenMode && dashView.isCompositingManagerRunning
+        opacity: 0.89
+        visible: dashView.dashMode == DashDeclarativeView.FullScreenMode && screen.isCompositingManagerRunning
     }
 
     BorderImage {
         anchors.fill: parent
         visible: dashView.dashMode == DashDeclarativeView.DesktopMode
-        source: dashView.isCompositingManagerRunning ? "artwork/desktop_dash_background.sci" : "artwork/desktop_dash_background_no_transparency.sci"
+        source: screen.isCompositingManagerRunning ? "artwork/desktop_dash_background.sci" : "artwork/desktop_dash_background_no_transparency.sci"
     }
     /* /Backgrounds */
 
 
=== removed file 'spread/GnomeBackground.qml'
--- spread/GnomeBackground.qml	2011-04-19 14:11:36 +0000
+++ spread/GnomeBackground.qml	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2010-2011 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 Qt 4.7
-import gconf 1.0
-/* Necessary to access the blended image provider and CacheEffect */
-import Unity2d 1.0
-
-Item {
-    property string overlay_color
-    property real overlay_alpha
-    clip: true
-
-// FIXME: disabled since it doesn't work properly with a size animation
-//    /* Avoid redraw at rendering */
-//    effect: CacheEffect {}
-
-    GConfItem {
-        id: primary_color
-        key: "/desktop/gnome/background/primary_color"
-    }
-
-    GConfItem {
-        id: picture_filename
-        key: "/desktop/gnome/background/picture_filename"
-    }
-
-    GConfItem {
-        id: picture_options
-        key: "/desktop/gnome/background/picture_options"
-    }
-
-    Rectangle {
-        Rectangle {
-            anchors.fill: parent
-            opacity: overlay_alpha
-            color: overlay_color
-        }
-
-        anchors.fill: parent
-        color: primary_color.value
-    }
-
-    Image {
-        id: picture
-
-        visible: picture_filename.value
-        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 = picture_filename.value
-            if(filename == "/usr/share/backgrounds/warty-final-ubuntu.png")
-                filename = engineBaseUrl + "artwork/warty-final-ubuntu.jpg"
-
-            if(overlay_alpha > 0.0)
-                return "image://blended/%1color=%2alpha=%3".arg(filename).arg(overlay_color).arg(overlay_alpha)
-            else
-                return filename
-        }
-        width: screen.geometry.width
-        height: screen.geometry.height
-
-        smooth: true
-        x: - launcherMaximumWidth
-        y: - screen.availableGeometry.y
-
-        /* Possible modes are:
-            - "wallpaper"
-            - "centered" (NOT IMPLEMENTED)
-            - "scaled"
-            - "stretched"
-            - "zoom"
-            - "spanned" (NOT IMPLEMENTED)
-        */
-        fillMode: {
-            if(picture_options.value == "wallpaper")
-                return Image.Tile
-            else if(picture_options.value == "scaled")
-                return Image.PreserveAspectFit
-            else if(picture_options.value == "stretched")
-                return Image.Stretch
-            else if(picture_options.value == "zoom")
-                return Image.PreserveAspectCrop
-            else return Image.PreserveAspectFit
-        }
-    }
-}
 
=== modified file 'spread/Workspace.qml'
--- spread/Workspace.qml	2011-03-22 06:04:20 +0000
+++ spread/Workspace.qml	2011-06-06 17:26:28 +0000
@@ -18,6 +18,7 @@
 
 import Qt 4.7
 import "utils.js" as Utils
+import Unity2d 1.0 /* Necessary for GnomeBackground */
 
 FocusScope {
     id: workspace
@@ -37,6 +38,9 @@
         anchors.fill: parent
         overlay_color: "black"
         overlay_alpha: 0
+
+        clip: true
+        cached: false
     }
 
     Windows {