Merge lp:~aacid/unity-2d/unity-2d_move_alwaysFullScreen into lp:unity-2d

[Albert Astals Cid]

Move the alwaysFullScreen logic to the shellmanager. Make the DashClient just be a client

[Gerry Boland (gerboland)]

Problem: Setting the dconf key com.canonical.unity-2d.formFactor to "tv" is not cuaing Dash to open fullscreen.

Only one minor thing:

+ <signal name="activeLensChanged"

is adding a rogue space.

[lp:~aacid/unity-2d/unity-2d_move_alwaysFullScreen]

932. By Albert Astals Cid on 2012-02-23

Remove spac change

933. By Albert Astals Cid on 2012-02-23

Rename to the proper name

[Albert Astals Cid (aacid)]

Both fixed

[Gerry Boland (gerboland)]

Looks good, thank you

review: Approve

=== modified file 'libunity-2d-private/src/dashclient.cpp'
--- libunity-2d-private/src/dashclient.cpp	2012-02-09 02:44:32 +0000
+++ libunity-2d-private/src/dashclient.cpp	2012-02-23 15:36:24 +0000
@@ -40,9 +40,6 @@
 static const char* DASH_DBUS_PATH = "/Dash";
 static const char* DASH_DBUS_INTERFACE = "com.canonical.Unity2d.Dash";
 
-static const int DASH_MIN_SCREEN_WIDTH = 1280;
-static const int DASH_MIN_SCREEN_HEIGHT = 1084;
-
 DashClient::DashClient(QObject* parent)
 : QObject(parent)
 , m_dashDbusIface(0)
@@ -66,15 +63,6 @@
                                                                this);
         connect(watcher, SIGNAL(serviceRegistered(QString)), SLOT(connectToDash()));
     }
-
-    connect(QApplication::desktop(), SIGNAL(resized(int)), SLOT(updateAlwaysFullScreen()));
-
-    // FIXME: we need to use a queued connection here otherwise QConf will deadlock for some reason
-    // when we read any property from the slot (which we need to do). We need to check why this
-    // happens and report a bug to dconf-qt to get it fixed.
-    connect(&unity2dConfiguration(), SIGNAL(formFactorChanged(QString)),
-                                     SLOT(updateAlwaysFullScreen()), Qt::QueuedConnection);
-    updateAlwaysFullScreen();
 }
 
 void DashClient::connectToDash()
@@ -87,6 +75,8 @@
                                          QDBusConnection::sessionBus(), this);
     connect(m_dashDbusIface, SIGNAL(activeChanged(bool)),
             SLOT(slotDashActiveChanged(bool)));
+    connect(m_dashDbusIface, SIGNAL(alwaysFullScreenChanged(bool)),
+            SLOT(slotAlwaysFullScreenChanged(bool)));
 
     QVariant value = m_dashDbusIface->property("active");
     if (value.isValid()) {
@@ -94,6 +84,13 @@
     } else {
         UQ_WARNING << "Fetching Dash.active property failed";
     }
+
+    value = m_dashDbusIface->property("alwaysFullScreen");
+    if (value.isValid()) {
+        m_alwaysFullScreen = value.toBool();
+    } else {
+        UQ_WARNING << "Fetching Dash.alwaysFullScreen property failed";
+    }
 }
 
 DashClient* DashClient::instance()
@@ -128,26 +125,12 @@
     }
 }
 
-QSize DashClient::minimumSizeForDesktop()
-{
-    return QSize(DASH_MIN_SCREEN_WIDTH, DASH_MIN_SCREEN_HEIGHT);
-}
-
-void DashClient::updateAlwaysFullScreen()
-{
-    bool alwaysFullScreen;
-    if (unity2dConfiguration().property("formFactor").toString() != "desktop") {
-        alwaysFullScreen = true;
-    } else {
-        QRect rect = QApplication::desktop()->screenGeometry(QPoint());
-        QSize minSize = minimumSizeForDesktop();
-        alwaysFullScreen = rect.width() < minSize.width() && rect.height() < minSize.height();
-    }
-
-    if (m_alwaysFullScreen != alwaysFullScreen) {
-        m_alwaysFullScreen = alwaysFullScreen;
-        Q_EMIT alwaysFullScreenChanged();
-    }
+void DashClient::slotAlwaysFullScreenChanged(bool value)
+{
+    if (m_alwaysFullScreen != value) {
+        m_alwaysFullScreen = value;
+    }
+    Q_EMIT alwaysFullScreenChanged();
 }
 
 bool DashClient::alwaysFullScreen() const

=== modified file 'libunity-2d-private/src/dashclient.h'
--- libunity-2d-private/src/dashclient.h	2012-02-09 02:44:32 +0000
+++ libunity-2d-private/src/dashclient.h	2012-02-23 15:36:24 +0000
@@ -45,7 +45,6 @@
     void setActive(bool active);
 
     bool alwaysFullScreen() const;
-    static QSize minimumSizeForDesktop();
 
 Q_SIGNALS:
     void activeChanged(bool);
@@ -54,7 +53,7 @@
 private Q_SLOTS:
     void connectToDash();
     void slotDashActiveChanged(bool);
-    void updateAlwaysFullScreen();
+    void slotAlwaysFullScreenChanged(bool);
 
 private:
     DashClient(QObject* parent = 0);

=== modified file 'shell/app/dash.xml'
--- shell/app/dash.xml	2012-02-09 11:07:00 +0000
+++ shell/app/dash.xml	2012-02-23 15:36:24 +0000
@@ -21,6 +21,9 @@
         <property name="active" type="b" access="readwrite">
             <dox:d>True if the Dash is active</dox:d>
         </property>
+        <property name="alwaysFullScreen" type="b" access="read">
+            <dox:d>True if the Dash has to be in full screen mode</dox:d>
+        </property>
         <property name="activeLens" type="s" access="readwrite">
             <dox:d>The currently active lens</dox:d>
         </property>
@@ -30,6 +33,12 @@
                         <dox:d>True if the Dash is active</dox:d>
                 </arg>
         </signal>
+        <signal name="alwaysFullScreenChanged">
+                <dox:d>Signals when the alwaysFullScreen status of the Dash changes</dox:d>
+                <arg name="active" type="b" direction="out">
+                        <dox:d>True if the Dash has to be in full screen mode</dox:d>
+                </arg>
+        </signal>
         <signal name="activeLensChanged">
                 <dox:d>Signals when the currently lens in the Dash changes</dox:d>
                 <arg name="activeLens" type="s" direction="out">

=== modified file 'shell/app/dashdbus.cpp'
--- shell/app/dashdbus.cpp	2012-02-09 11:07:00 +0000
+++ shell/app/dashdbus.cpp	2012-02-23 15:36:24 +0000
@@ -34,6 +34,7 @@
 , m_view(view)
 {
     connect(m_view, SIGNAL(dashActiveChanged(bool)), SIGNAL(activeChanged(bool)));
+    connect(m_view, SIGNAL(dashAlwaysFullScreenChanged(bool)), SIGNAL(alwaysFullScreenChanged(bool)));
     connect(m_view, SIGNAL(activeLensChanged(QString)), SIGNAL(activeLensChanged(QString)));
 }
 
@@ -79,6 +80,12 @@
     m_view->setDashActive(active);
 }
 
+bool
+DashDBus::alwaysFullScreen() const
+{
+    return m_view->dashAlwaysFullScreen();
+}
+
 QString
 DashDBus::activeLens() const
 {

=== modified file 'shell/app/dashdbus.h'
--- shell/app/dashdbus.h	2012-02-09 11:07:00 +0000
+++ shell/app/dashdbus.h	2012-02-23 15:36:24 +0000
@@ -35,6 +35,7 @@
 {
     Q_OBJECT
     Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+    Q_PROPERTY(bool alwaysFullScreen READ alwaysFullScreen NOTIFY alwaysFullScreenChanged)
     Q_PROPERTY(QString activeLens READ activeLens WRITE setActiveLens NOTIFY activeLensChanged)
 
 public:
@@ -45,6 +46,7 @@
 
     bool active() const;
     void setActive(bool active);
+    bool alwaysFullScreen() const;
     QString activeLens() const;
     void setActiveLens(QString activeLens);
 
@@ -54,6 +56,7 @@
 
 Q_SIGNALS:
     void activeChanged(bool);
+    void alwaysFullScreenChanged(bool);
     void activeLensChanged(QString);
 
 private:

=== modified file 'shell/app/shell.cpp'
--- shell/app/shell.cpp	2012-02-23 10:13:49 +0000
+++ shell/app/shell.cpp	2012-02-23 15:36:24 +0000
@@ -42,7 +42,6 @@
 // Local
 #include "config.h"
 #include "shelldeclarativeview.h"
-#include "dashclient.h"
 #include "dashdbus.h"
 
 int main(int argc, char *argv[])
@@ -85,16 +84,6 @@
     /* Load the QML UI, focus and show the window */
     view.setResizeMode(QDeclarativeView::SizeViewToRootObject);
     view.rootContext()->setContextProperty("declarativeView", &view);
-    // WARNING This declaration of dashClient used to be in Unity2d/plugin.cpp
-    // but it lead to locks when both the shell and the spread were started
-    // at the same time since SpreadMonitor QDBusServiceWatcher::serviceRegistered
-    // and DashClient QDBusServiceWatcher::serviceRegistered
-    // triggered at the same time ending up with both creating QDBusInterface
-    // to eachother in the main thread meaning they would block
-    // In case you need to have a DashClient in the spread the fix for the problem
-    // is moving the QDbusInterface creation to a thread so it does not block
-    // the main thread
-    view.rootContext()->setContextProperty("dashClient", DashClient::instance());
     view.setSource(rootFileUrl);
 
     /* Unset DESKTOP_AUTOSTART_ID in order to avoid child processes (launched

=== modified file 'shell/app/shelldeclarativeview.cpp'
--- shell/app/shelldeclarativeview.cpp	2012-02-13 23:46:04 +0000
+++ shell/app/shelldeclarativeview.cpp	2012-02-23 15:36:24 +0000
@@ -51,12 +51,16 @@
 
 static const char* COMMANDS_LENS_ID = "commands.lens";
 
+static const int DASH_MIN_SCREEN_WIDTH = 1280;
+static const int DASH_MIN_SCREEN_HEIGHT = 1084;
+
 ShellDeclarativeView::ShellDeclarativeView()
     : Unity2DDeclarativeView()
     , m_mode(DesktopMode)
     , m_expanded(true)
     , m_active(false)
     , m_superKeyPressed(false)
+    , m_dashAlwaysFullScreen(false)
     , m_superKeyHeld(false)
 {
     setAttribute(Qt::WA_X11NetWmWindowTypeDock, true);
@@ -90,6 +94,15 @@
 
     connect(m_screenInfo, SIGNAL(availableGeometryChanged(QRect)), SLOT(updateShellPosition()));
     updateShellPosition();
+
+    // FIXME: we need to use a queued connection here otherwise QConf will deadlock for some reason
+    // when we read any property from the slot (which we need to do). We need to check why this
+    // happens and report a bug to dconf-qt to get it fixed.
+    connect(&unity2dConfiguration(), SIGNAL(formFactorChanged(QString)),
+                                     SLOT(updateDashAlwaysFullScreen()), Qt::QueuedConnection);
+    connect(QApplication::desktop(), SIGNAL(resized(int)), SLOT(updateDashAlwaysFullScreen()));
+
+    updateDashAlwaysFullScreen();
 }
 
 void
@@ -229,6 +242,11 @@
     return m_expanded;
 }
 
+bool ShellDeclarativeView::dashAlwaysFullScreen() const
+{
+    return m_dashAlwaysFullScreen;
+}
+
 void
 ShellDeclarativeView::setActiveLens(const QString& activeLens)
 {
@@ -279,6 +297,28 @@
     }
 }
 
+static QSize minimumSizeForDesktop()
+{
+    return QSize(DASH_MIN_SCREEN_WIDTH, DASH_MIN_SCREEN_HEIGHT);
+}
+
+void ShellDeclarativeView::updateDashAlwaysFullScreen()
+{
+    bool dashAlwaysFullScreen;
+    if (unity2dConfiguration().property("formFactor").toString() != "desktop") {
+        dashAlwaysFullScreen = true;
+    } else {
+        const QRect rect = m_screenInfo->geometry();
+        const QSize minSize = minimumSizeForDesktop();
+        dashAlwaysFullScreen = rect.width() < minSize.width() && rect.height() < minSize.height();
+    }
+
+    if (m_dashAlwaysFullScreen != dashAlwaysFullScreen) {
+        m_dashAlwaysFullScreen = dashAlwaysFullScreen;
+        Q_EMIT dashAlwaysFullScreenChanged(dashAlwaysFullScreen);
+    }
+}
+
 /* ----------------- super key handling ---------------- */
 
 void

=== modified file 'shell/app/shelldeclarativeview.h'
--- shell/app/shelldeclarativeview.h	2012-02-23 10:13:49 +0000
+++ shell/app/shelldeclarativeview.h	2012-02-23 15:36:24 +0000
@@ -38,6 +38,7 @@
     Q_PROPERTY(DashMode dashMode READ dashMode WRITE setDashMode NOTIFY dashModeChanged)
     Q_PROPERTY(QString activeLens READ activeLens WRITE setActiveLens NOTIFY activeLensChanged)
     Q_PROPERTY(bool focus READ hasFocus NOTIFY focusChanged) // overridden to add notify
+    Q_PROPERTY(bool dashAlwaysFullScreen READ dashAlwaysFullScreen NOTIFY dashAlwaysFullScreenChanged)
     Q_PROPERTY(bool superKeyHeld READ superKeyHeld NOTIFY superKeyHeldChanged)
     Q_PROPERTY(bool haveCustomHomeShortcuts READ haveCustomHomeShortcuts)
 
@@ -64,6 +65,7 @@
     DashMode dashMode() const;
     const QString& activeLens() const;
     bool expanded() const;
+    bool dashAlwaysFullScreen() const;
     bool superKeyHeld() const { return m_superKeyHeld; }
     QRect monitoredArea() const;
     bool monitoredAreaContainsMouse() const;
@@ -88,6 +90,7 @@
     void monitoredAreaChanged();
     void monitoredAreaContainsMouseChanged();
 
+    void dashAlwaysFullScreenChanged(bool dashAlwaysFullScreen);
     void superKeyHeldChanged(bool superKeyHeld);
     void superKeyTapped();
     void activateShortcutPressed(int itemIndex);
@@ -105,6 +108,8 @@
     void showCommandsLens();
     void onAltF1Pressed();
 
+    void updateDashAlwaysFullScreen();
+
 protected:
     virtual void showEvent(QShowEvent *event);
     virtual void mouseMoveEvent(QMouseEvent *event);
@@ -126,6 +131,7 @@
     bool m_active;
 
     bool m_superKeyPressed;
+    bool m_dashAlwaysFullScreen;
     bool m_superKeyHeld;
     bool m_superPressIgnored;
     QTimer m_superKeyHoldTimer;

=== modified file 'shell/dash/Dash.qml'
--- shell/dash/Dash.qml	2012-02-16 23:25:25 +0000
+++ shell/dash/Dash.qml	2012-02-23 15:36:24 +0000
@@ -64,7 +64,7 @@
     Binding {
         target: declarativeView
         property: "dashMode"
-        value: dashClient.alwaysFullScreen || dash2dConfiguration.fullScreen ?
+        value: declarativeView.dashAlwaysFullScreen || dash2dConfiguration.fullScreen ?
                ShellDeclarativeView.FullScreenMode : ShellDeclarativeView.DesktopMode
     }