Merge lp:~agateau/unity-2d/desktop-dash-bg into lp:unity-2d/3.0

[Aurélien Gâteau]

[dash] Fix dash background:
- Do not overlap desktop dash borders
- Use a black semi transparent background in fullscreen + composite mode

[dash] Fix dash background:
- Do not overlap desktop dash borders
- Use a black semi transparent background in fullscreen + composite mode

[Florian Boucault (fboucault)]

In collapsed mode the content still overlaps the search bar.

review: Needs Fixing (functional)

[Florian Boucault (fboucault)]

> In collapsed mode the content still overlaps the search bar.

And by search bar, I meant the border:

In collapsed mode the content still overlaps the border*

[Florian Boucault (fboucault)]

Adding a isCompositingManagerRunningChanged signal not only is unrelated to that MR but also is only meant as far as I understand it to shut up QML warnings but the signal is never fired. It does not make sense to let the users of the API think that there is a change notification emitted when there is none.

review: Needs Fixing (code)

[Florian Boucault (fboucault)]

I am tired of repeating the same things:

"""
About "Content/search results should not overlap the border.", I believe the correct values are:

        anchors.rightMargin: 37
        anchors.bottomMargin: 39

That is for the item containing all the content (= item containing search_entry, pageLoader, etc.)

Also I guess the fullScreenButton will have to be moved out of it.
"""

review: Needs Fixing (code)

[Aurélien Gâteau (agateau)]

On Thursday 24 February 2011 13:19:11 you wrote:
> Review: Needs Fixing code
> I am tired of repeating the same things:

Done.

[lp:~agateau/unity-2d/desktop-dash-bg]

411. By Aurélien Gâteau on 2011-02-24

Rework the way the border bug is fixed

[Aurélien Gâteau (agateau)]

On Thursday 24 February 2011 13:04:56 you wrote:
> Review: Needs Fixing code
> Adding a isCompositingManagerRunningChanged signal not only is unrelated to
> that MR but also is only meant as far as I understand it to shut up QML
> warnings but the signal is never fired. It does not make sense to let the
> users of the API think that there is a change notification emitted when
> there is none.

It is related in that the property was added in the previous desktop-dash MR.

Reducing noise on stderr is important to be able to notice real problems.

=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2011-02-24 01:13:42 +0000
+++ places/app/dashdeclarativeview.cpp	2011-02-24 15:38:56 +0000
@@ -34,7 +34,7 @@
 static const int DASH_MIN_SCREEN_HEIGHT = 1084;
 
 static const int DASH_DESKTOP_WIDTH = 989;
-static const int DASH_DESKTOP_COLLAPSED_HEIGHT = 78;
+static const int DASH_DESKTOP_COLLAPSED_HEIGHT = 115;
 static const int DASH_DESKTOP_EXPANDED_HEIGHT = 606;
 
 DashDeclarativeView::DashDeclarativeView()

=== modified file 'places/app/dashdeclarativeview.h'
--- places/app/dashdeclarativeview.h	2011-02-24 01:13:42 +0000
+++ places/app/dashdeclarativeview.h	2011-02-24 15:38:56 +0000
@@ -31,7 +31,7 @@
     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)
+    Q_PROPERTY(bool isCompositingManagerRunning READ isCompositingManagerRunning NOTIFY isCompositingManagerRunningChanged)
 
 public:
     enum DashMode {
@@ -68,6 +68,7 @@
 
     void screenGeometryChanged();
     void availableGeometryChanged();
+    void isCompositingManagerRunningChanged(bool);
 
 protected:
     void resizeEvent(QResizeEvent*);

=== modified file 'places/dash.qml'
--- places/dash.qml	2011-02-21 17:45:59 +0000
+++ places/dash.qml	2011-02-24 15:38:56 +0000
@@ -65,11 +65,19 @@
         Component.onCompleted: startAllPlaceServices()
     }
 
+    /* Backgrounds */
     GnomeBackground {
         anchors.fill: parent
         overlay_color: "black"
         overlay_alpha: 0.71
-        visible: dashView.dashMode == DashDeclarativeView.FullScreenMode
+        visible: dashView.dashMode == DashDeclarativeView.FullScreenMode && !dashView.isCompositingManagerRunning
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: "black"
+        opacity: 0.69
+        visible: dashView.dashMode == DashDeclarativeView.FullScreenMode && dashView.isCompositingManagerRunning
     }
 
     BorderImage {
@@ -77,9 +85,13 @@
         visible: dashView.dashMode == DashDeclarativeView.DesktopMode
         source: dashView.isCompositingManagerRunning ? "artwork/desktop_dash_background.sci" : "artwork/desktop_dash_background_no_transparency.sci"
     }
+    /* /Backgrounds */
 
     Item {
         anchors.fill: parent
+        anchors.bottomMargin: dashView.dashMode == DashDeclarativeView.DesktopMode ? 38 : 0
+        anchors.rightMargin: dashView.dashMode == DashDeclarativeView.DesktopMode ? 40 : 0
+
         visible: dashView.active
 
         /* Unhandled keys will always be forwarded to the search bar. That way
@@ -119,26 +131,6 @@
             anchors.rightMargin: 19
         }
 
-        Button {
-            id: fullScreenButton
-            anchors.bottom: parent.bottom
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-            anchors.bottomMargin: 15
-            width: fullScreenButtonImage.sourceSize.width
-            height: fullScreenButtonImage.sourceSize.height
-            visible: dashView.dashMode != DashDeclarativeView.FullScreenMode
-
-            Image {
-                id: fullScreenButtonImage
-                source: "artwork/fullscreen_button.png"
-            }
-
-            onClicked: {
-                dashView.dashMode = DashDeclarativeView.FullScreenMode
-            }
-        }
-
         Loader {
             id: pageLoader
 
@@ -152,4 +144,24 @@
             anchors.rightMargin: refine_search.folded ? 0 : 15
         }
     }
+
+    Button {
+        id: fullScreenButton
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.rightMargin: 15
+        anchors.bottomMargin: 15
+        width: fullScreenButtonImage.sourceSize.width
+        height: fullScreenButtonImage.sourceSize.height
+        visible: dashView.dashMode != DashDeclarativeView.FullScreenMode
+
+        Image {
+            id: fullScreenButtonImage
+            source: "artwork/fullscreen_button.png"
+        }
+
+        onClicked: {
+            dashView.dashMode = DashDeclarativeView.FullScreenMode
+        }
+    }
 }