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

[Florian Boucault]

[dash] Properly position background wallpaper when using a non compositing window manager.

New Unity2DDeclarativeView::globalPosition property that cancels the need for using 'launcherMaximumWidth'.
Every QML based component (launcher, spread, dash) now exposes a 'declarativeView' variable.

[Gerry Boland (gerboland)]

Looks good, in.

review: Approve

=== modified file 'launcher/app/launcher.cpp'
--- launcher/app/launcher.cpp	2011-07-27 09:42:32 +0000
+++ launcher/app/launcher.cpp	2011-08-09 13:43:21 +0000
@@ -109,6 +109,7 @@
         launcherView->engine()->addImportPath(unity2dDirectory() + "/libunity-2d-private/");
     }
 
+    launcherView->rootContext()->setContextProperty("declarativeView", launcherView);
     launcherView->rootContext()->setContextProperty("launcherView", launcherView);
     launcherView->rootContext()->setContextProperty("panel", &panel);
     launcherView->rootContext()->setContextProperty("visibilityController", visibilityController);

=== modified file 'libunity-2d-private/Unity2d/GnomeBackground.qml'
--- libunity-2d-private/Unity2d/GnomeBackground.qml	2011-07-11 10:26:02 +0000
+++ libunity-2d-private/Unity2d/GnomeBackground.qml	2011-08-09 13:43:21 +0000
@@ -87,7 +87,7 @@
         height: screen.geometry.height
 
         smooth: true
-        x: screen.availableGeometry.x - launcherMaximumWidth
+        x: screen.availableGeometry.x - declarativeView.globalPosition.x
         y: -screen.availableGeometry.y
 
         /* Possible modes are:

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.cpp'
--- libunity-2d-private/src/unity2ddeclarativeview.cpp	2011-08-05 15:14:04 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.cpp	2011-08-09 13:43:21 +0000
@@ -48,6 +48,11 @@
     Q_EMIT transparentBackgroundChanged(transparentBackground);
 }
 
+QPoint Unity2DDeclarativeView::globalPosition() const
+{
+    return mapToGlobal(QPoint(0,0));
+}
+
 void Unity2DDeclarativeView::setupViewport()
 {
     if (m_useOpenGL) {
@@ -98,6 +103,12 @@
     }
 }
 
+void Unity2DDeclarativeView::moveEvent(QMoveEvent* event)
+{
+    Q_EMIT globalPositionChanged(globalPosition());
+}
+
+
 /* Obtaining & Discarding Keyboard Focus for Window on Demand
  *
  * In the X world, activating a window means to give it the input (keyboard)

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.h'
--- libunity-2d-private/src/unity2ddeclarativeview.h	2011-08-01 11:58:35 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.h	2011-08-09 13:43:21 +0000
@@ -9,6 +9,7 @@
 
     Q_PROPERTY(bool useOpenGL READ useOpenGL WRITE setUseOpenGL NOTIFY useOpenGLChanged)
     Q_PROPERTY(bool transparentBackground READ transparentBackground WRITE setTransparentBackground NOTIFY transparentBackgroundChanged)
+    Q_PROPERTY(QPoint globalPosition READ globalPosition NOTIFY globalPositionChanged)
 
 public:
     Unity2DDeclarativeView(QWidget *parent = 0);
@@ -16,6 +17,7 @@
     // getters
     bool useOpenGL() const;
     bool transparentBackground() const;
+    QPoint globalPosition() const;
 
     // setters
     void setUseOpenGL(bool);
@@ -24,9 +26,11 @@
 Q_SIGNALS:
     void useOpenGLChanged(bool);
     void transparentBackgroundChanged(bool);
+    void globalPositionChanged(QPoint);
 
 protected:
     void setupViewport();
+    virtual void moveEvent(QMoveEvent* event);
 
 protected Q_SLOTS:
     void forceActivateWindow();

=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2011-07-28 11:10:37 +0000
+++ places/app/dashdeclarativeview.cpp	2011-08-09 13:43:21 +0000
@@ -174,15 +174,15 @@
         m_launcherClient->endForceVisible();
         activeChanged(false);
     } else {
+        if (m_mode == FullScreenMode) {
+            fitToAvailableSpace();
+        } else {
+            resizeToDesktopModeSize();
+        }
         show();
         raise();
         // We need a delay, otherwise the window may not be visible when we try to activate it
         QTimer::singleShot(0, this, SLOT(forceActivateWindow()));
-        if (m_mode == FullScreenMode) {
-            fitToAvailableSpace();
-        } else {
-            resizeToDesktopModeSize();
-        }
         if (oldMode == HiddenMode) {
             // Check old mode to ensure we do not call BeginForceVisible twice
             // if we go from desktop to fullscreen mode

=== modified file 'places/app/places.cpp'
--- places/app/places.cpp	2011-07-18 13:47:29 +0000
+++ places/app/places.cpp	2011-08-09 13:43:21 +0000
@@ -65,6 +65,7 @@
 
     /* Load the QML UI, focus and show the window */
     view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    view.rootContext()->setContextProperty("declarativeView", &view);
     view.rootContext()->setContextProperty("dashView", &view);
     view.setSource(QUrl("./dash.qml"));
 

=== modified file 'spread/Windows.qml'
--- spread/Windows.qml	2011-06-23 17:08:53 +0000
+++ spread/Windows.qml	2011-08-09 13:43:21 +0000
@@ -149,8 +149,8 @@
                             target: spreadWindow
                             /* Note that we subtract the availableGeometry x and y since window.location is
                             expressed in global screen coordinates. */
-                            x: window.position.x - launcherMaximumWidth
-                            y: window.position.y - screen.availableGeometry.y
+                            x: window.position.x - declarativeView.globalPosition.x
+                            y: window.position.y - declarativeView.globalPosition.y
                             width: window.size.width
                             height: window.size.height
                             animateFollow: false

=== modified file 'spread/app/spread.cpp'
--- spread/app/spread.cpp	2011-07-18 13:47:29 +0000
+++ spread/app/spread.cpp	2011-08-09 13:43:21 +0000
@@ -62,10 +62,9 @@
     control.connect(&view, SIGNAL(visibleChanged(bool)), SLOT(setIsShown(bool)));
     view.rootContext()->setContextProperty("control", &control);
 
-    view.rootContext()->setContextProperty("launcherMaximumWidth", LauncherClient::MaximumWidth);
-
     /* Load the QML UI, focus and show the window */
     view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    view.rootContext()->setContextProperty("declarativeView", &view);
     view.rootContext()->setContextProperty("spreadView", &view);
     view.setSource(QUrl("./Workspaces.qml"));