Merge lp:~gerboland/unity-2d/shell-background-isolate into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Gerry Boland]

[shell] Change the Dash's Background into a standalone element.

[Albert Astals Cid (aacid)]

You have
  backgrounds.fill: parent
in two places that do the same, the Background item in Dash.qml and the root Item in Background.qml, not that it really matters, but maybe makes sense just having it in one place?

I'm a bit more concerned about the 39, 37 and 0, 0 for the margins when previously we just used content.anchors.bottomMargin and content.anchors.rightMargin, wouldn't it be better to introduce a property so you can assign it that way too?

review: Needs Fixing

[Tiago Salem Herrmann (tiagosh)]

works fine and the code is clean.
thanks.

review: Approve

[Florian Boucault (fboucault)]

Please resubmit the MR against lp:unity-2d

Unmerged revisions

952. By Gerry Boland on 2012-02-09

Merge latest shell & fix conflicts

951. By Gerry Boland on 2012-02-01

Update to trunk

950. By Gerry Boland on 2012-02-01

Remove unnecessary anchors.fill from Background.qml

949. By Gerry Boland on 2012-02-01

Add property to Background describing the border thicknesses. Use this to
specify the mergins needed in Dash.qml.

Thanks to Albert for this advice in MR.

948. By Gerry Boland on 2012-01-31

Dash gives Background it's position so it draws the right blurred background

947. By Gerry Boland on 2012-01-31

Coordinates of background to blur must be manually specified. Fix state typos.

946. By Gerry Boland on 2012-01-31

Use states to control desktop/fullscreen modes.

945. By Gerry Boland on 2012-01-30

[shell] Change the Dash's Background into a standalone element.

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-02-09 10:08:51 +0000
+++ shell/Shell.qml	2012-02-09 11:02:21 +0000
@@ -155,7 +155,7 @@
 
             InputShapeMask {
                 id: shape1
-                source: "shell/dash/artwork/desktop_dash_background_no_transparency.png"
+                source: "shell/common/artwork/desktop_dash_background_no_transparency.png"
                 color: "red"
                 position: Qt.point(dashLoader.width - 50, dashLoader.height - 49)
                 enabled: declarativeView.dashMode == ShellDeclarativeView.DesktopMode

=== added file 'shell/common/Background.qml'
--- shell/common/Background.qml	1970-01-01 00:00:00 +0000
+++ shell/common/Background.qml	2012-02-09 11:02:21 +0000
@@ -0,0 +1,109 @@
+/*
+ * 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 QtQuick 1.1
+import Unity2d 1.0
+import Effects 1.0
+
+Item {
+    id: background
+    property bool active: false
+    property bool fullscreen: false
+    property int bottomBorderThickness
+    property int rightBorderThickness
+    /* coordinates of top left corner needed to capture correct segment of background */
+    property int xPosition: 0
+    property int yPosition: 0
+
+    /* Avoid redraw at rendering */
+    effect: CacheEffect {}
+
+    Item {
+        anchors.fill: parent
+        anchors.bottomMargin: bottomBorderThickness
+        anchors.rightMargin: rightBorderThickness
+        clip: true
+
+        Image {
+            id: blurredBackground
+
+            effect: Blur {blurRadius: 12}
+
+            /* 'source' needs to be set when this becomes visible, that is when active
+               becomes true, so that a screenshot of the desktop is taken at that point.
+               See http://doc.qt.nokia.com/4.7-snapshot/qml-image.html#cache-prop
+            */
+
+            /* Use an image of the root window which essentially is a
+               capture of the entire screen */
+            source: active ? "image://window/root" : ""
+            cache: false
+
+            fillMode: Image.PreserveAspectCrop
+            x: -xPosition
+            y: -yPosition
+        }
+
+        Image {
+            anchors.fill: parent
+            fillMode: Image.PreserveAspectCrop
+            source: "artwork/background_sheen.png"
+        }
+    }
+
+    BorderImage {
+        id: border
+
+        /* Define properties of border here */
+        property int bottomThickness: 39
+        property int rightThickness: 37
+
+        anchors.fill: parent
+        source: desktop.isCompositingManagerRunning ? "artwork/desktop_dash_background.sci" : "artwork/desktop_dash_background_no_transparency.sci"
+        mirror: isRightToLeft()
+    }
+
+    states: [
+        State {
+            name: "normal"
+            when: !fullscreen
+            PropertyChanges {
+                target: background
+                bottomBorderThickness: border.bottomThickness
+                rightBorderThickness: border.rightThickness
+            }
+            PropertyChanges {
+                target: border
+                visible: true
+            }
+        },
+        State {
+            name: "fullscreen"
+            when: fullscreen
+            PropertyChanges {
+                target: background
+                bottomBorderThickness: 0
+                rightBorderThickness: 0
+            }
+            PropertyChanges {
+                target: border
+                visible: false
+            }
+        }
+    ]
+}

=== renamed file 'shell/dash/artwork/background_sheen.png' => 'shell/common/artwork/background_sheen.png'
=== renamed file 'shell/dash/artwork/desktop_dash_background.png' => 'shell/common/artwork/desktop_dash_background.png'
=== renamed file 'shell/dash/artwork/desktop_dash_background.sci' => 'shell/common/artwork/desktop_dash_background.sci'
=== renamed file 'shell/dash/artwork/desktop_dash_background_no_transparency.png' => 'shell/common/artwork/desktop_dash_background_no_transparency.png'
=== renamed file 'shell/dash/artwork/desktop_dash_background_no_transparency.sci' => 'shell/common/artwork/desktop_dash_background_no_transparency.sci'
=== modified file 'shell/dash/Dash.qml'
--- shell/dash/Dash.qml	2012-02-09 02:11:23 +0000
+++ shell/dash/Dash.qml	2012-02-09 11:02:21 +0000
@@ -209,55 +209,15 @@
         }
     }
 
-    Item {
+    Background {
         id: background
 
         anchors.fill: parent
 
-        /* Avoid redraw at rendering */
-        effect: CacheEffect {}
-
-        Item {
-            anchors.fill: parent
-            anchors.bottomMargin: content.anchors.bottomMargin
-            anchors.rightMargin: content.anchors.rightMargin
-            clip: true
-
-            Image {
-                id: blurredBackground
-
-                effect: Blur {blurRadius: 12}
-
-                /* 'source' needs to be set when the dash becomes visible, that
-                   is when dash.active becomes true, so that a
-                   screenshot of the windows behind the dash is taken at that
-                   point.
-                   See http://doc.qt.nokia.com/4.7-snapshot/qml-image.html#cache-prop
-                */
-
-                /* Use an image of the root window which essentially is a
-                   capture of the entire screen */
-                source: dash.active ? "image://window/root" : ""
-                cache: false
-
-                fillMode: Image.PreserveAspectCrop
-                x: -launcherLoader.width
-                y: -declarativeView.globalPosition.y
-            }
-
-            Image {
-                anchors.fill: parent
-                fillMode: Image.PreserveAspectCrop
-                source: "artwork/background_sheen.png"
-            }
-        }
-
-        BorderImage {
-            anchors.fill: parent
-            visible: declarativeView.dashMode == ShellDeclarativeView.DesktopMode
-            source: desktop.isCompositingManagerRunning ? "artwork/desktop_dash_background.sci" : "artwork/desktop_dash_background_no_transparency.sci"
-            mirror: isRightToLeft()
-        }
+        active: dash.active
+        fullscreen: declarativeView.dashMode != ShellDeclarativeView.DesktopMode
+        xPosition: launcherLoader.width
+        yPosition: declarativeView.globalPosition.y
     }
 
     Item {
@@ -267,8 +227,8 @@
         /* Margins in DesktopMode set so that the content does not overlap with
            the border defined by the background image.
         */
-        anchors.bottomMargin: declarativeView.dashMode == ShellDeclarativeView.DesktopMode ? 39 : 0
-        anchors.rightMargin: declarativeView.dashMode == ShellDeclarativeView.DesktopMode ? 37 : 0
+        anchors.bottomMargin: background.bottomBorderThickness
+        anchors.rightMargin: background.rightBorderThickness
 
         /* Unhandled keys will always be forwarded to the search bar. That way
            the user can type and search from anywhere in the interface without