Merge lp:~unity-2d-team/unity-2d/unity-2d-dash-always-fullscreen-by-resolution into lp:unity-2d

[Ugo Riboni]

[dash][panel] Refactor testing for forced dash fullscreen based on resolution into DashClient

[Ugo Riboni (uriboni)]

Forgot to mention it depends on https://code.launchpad.net/~unity-2d-team/unity-2d/unity-2d-dash-fullscreen-via-dconf/+merge/89867

[Florian Boucault (fboucault)]

Any reason why not defining minimumSizeForDesktop as a property already?

[Florian Boucault (fboucault)]

Don't expose the constructor of DashClient. It is private for a reason, because DashClient is a singleton only accessed through ::instance(). You want it accessible from QML alright, expose what ::instance() gives you from the Unity2d QML plugin with "engine->rootContext()->setContextProperty(...)"

review: Needs Fixing

[Florian Boucault (fboucault)]

Otherwise looks great. Will carry slightly more detailed code inspection and functional review.

[lp:~unity-2d-team/unity-2d/unity-2d-dash-always-fullscreen-by-resolution]

869. By Ugo Riboni on 2012-01-24

Expose DashClient as a singleton to QML

[Lohith D Shivamurthy (dyams)]

Functionally no issues found

[Ugo Riboni (uriboni)]

Pushed UI tests too

[lp:~unity-2d-team/unity-2d/unity-2d-dash-always-fullscreen-by-resolution]

870. By Ugo Riboni on 2012-01-25

Merge changes from parent feature branch

871. By Ugo Riboni on 2012-01-25

Fix tests so that they check the right thing depending on current screen resolution (we decided it's not proper to force resolution changes during tests)

[Ugo Riboni (uriboni)]

As mentioned in commit message 871: the proper way to test that the dash is always full screen when the resolution is lower than a certain threshold is to change the resolution during the test.
However since we're expecting that people will run tests on their own machines, this was not deemed acceptable.
So we decided that as a compromise the tests would work differently based on the current resolution on the test machine.

In any case, I ran the tests both with a very small resolution and a big one and they pass in both cases.

[lp:~unity-2d-team/unity-2d/unity-2d-dash-always-fullscreen-by-resolution]

872. By Ugo Riboni on 2012-01-26

Merge changes from parent branch

873. By Ugo Riboni on 2012-01-26

Merge changes from parent branch

874. By Ugo Riboni on 2012-01-26

Adapt the initial fullscreen test to current code

[Ugo Riboni (uriboni)]

Updated to match changes in parent branch: https://code.launchpad.net/~unity-2d-team/unity-2d/unity-2d-dash-fullscreen-via-dconf/+merge/89867

[lp:~unity-2d-team/unity-2d/unity-2d-dash-always-fullscreen-by-resolution]

875. By Ugo Riboni on 2012-01-26

Merge fixes to tests from parent branch

=== modified file 'config.h.in'
--- config.h.in	2011-12-07 19:20:54 +0000
+++ config.h.in	2012-01-26 18:08:33 +0000
@@ -11,6 +11,7 @@
 static const char* UNITY2D_DCONF_SCHEMA = "com.canonical.Unity2d";
 static const char* LAUNCHER2D_DCONF_SCHEMA = "com.canonical.Unity2d.Launcher";
 static const char* PANEL2D_DCONF_SCHEMA = "com.canonical.Unity2d.Panel";
+static const char* DASH2D_DCONF_SCHEMA = "com.canonical.Unity2d.Dash";
 
 static const char* UNITY_DCONF_SCHEMA = "com.canonical.Unity";
 static const char* LAUNCHER_DCONF_SCHEMA = "com.canonical.Unity.Launcher";
@@ -31,6 +32,11 @@
     return configuration;
 }
 
+inline QConf& dash2dConfiguration() {
+    static QConf configuration(DASH2D_DCONF_SCHEMA);
+    return configuration;
+}
+
 inline QConf& unityConfiguration() {
     static QConf configuration(UNITY_DCONF_SCHEMA);
     return configuration;
 
=== modified file 'data/com.canonical.Unity2d.gschema.xml'
--- data/com.canonical.Unity2d.gschema.xml	2011-12-01 09:55:45 +0000
+++ data/com.canonical.Unity2d.gschema.xml	2012-01-26 18:08:33 +0000
@@ -36,4 +36,14 @@
       </description>
     </key>
   </schema>
+  <schema path="/com/canonical/unity-2d/dash/" id="com.canonical.Unity2d.Dash" gettext-domain="unity-2d">
+    <key type="b" name="full-screen">
+      <default>false</default>
+      <summary>The current fullscreen status of the dash</summary>
+      <description>
+        Describe if the dash should be fullscreen or not. If the dash is already running this setting
+        is applied immediately, otherwise it is applied as soon as the dash is activated again.
+      </description>
+    </key>
+  </schema>
 </schemalist>
 
=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2012-01-19 14:35:41 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2012-01-26 18:08:33 +0000
@@ -22,7 +22,6 @@
 */
 #include "plugin.h"
 
-#include "dashsettings.h"
 #include "launcherapplication.h"
 #include "launcherdevice.h"
 #include "trash.h"
@@ -50,6 +49,7 @@
 #include "launcherdropitem.h"
 
 #include "config.h"
+#include "dashclient.h"
 
 #include "autohidebehavior.h"
 #include "intellihidebehavior.h"
@@ -81,8 +81,6 @@
 
 #include <X11/Xlib.h>
 
-using namespace Unity2d;
-
 /* FIXME: This should be done more properly, it's just an hack this way.
           We should silence only the errors that we know we can produce.
           We could probably also learn something from gdk-error-trap-push.
@@ -100,8 +98,6 @@
 {
     qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");
 
-    qmlRegisterType<DashSettings>(uri, 0, 1, "DashSettings");
-
     qmlRegisterType<WindowInfo>(uri, 0, 1, "WindowInfo");
     qmlRegisterType<WindowsList>(uri, 0, 1, "WindowsList");
     qmlRegisterType<ScreenInfo>(); // Register the type as non creatable
@@ -162,6 +158,7 @@
     qmlRegisterType<FilterOption>();
     qmlRegisterType<FilterOptions>();
 
+    qmlRegisterType<DashClient>();
 }
 
 void Unity2dPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)
@@ -179,6 +176,10 @@
     engine->rootContext()->setContextProperty("screen", ScreenInfo::instance());
     engine->rootContext()->setContextProperty("iconUtilities", new IconUtilities(engine));
 
+    /* Expose QConf objects as a context property not to initialize it multiple times */
+    engine->rootContext()->setContextProperty("dash2dConfiguration", &dash2dConfiguration());
+    engine->rootContext()->setContextProperty("dashClient", DashClient::instance());
+
     /* Critically important to set the client type to pager because wnck
        will pass that type over to the window manager through XEvents.
        Window managers tend to respect orders from pagers to the letter by
 
=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2012-01-19 14:35:41 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2012-01-26 18:08:33 +0000
@@ -4,7 +4,6 @@
 set(lib${LIB_NAME}_SRCS
     bfb.cpp
     dashclient.cpp
-    dashsettings.cpp
     debug.cpp
     gconnector.cpp
     gimageutils.cpp
 
=== modified file 'libunity-2d-private/src/dashclient.cpp'
--- libunity-2d-private/src/dashclient.cpp	2011-08-11 15:36:04 +0000
+++ libunity-2d-private/src/dashclient.cpp	2012-01-26 18:08:33 +0000
@@ -32,15 +32,21 @@
 #include <QDBusConnectionInterface>
 #include <QDBusInterface>
 #include <QDBusServiceWatcher>
+#include <QDesktopWidget>
+#include <QRect>
 
 static const char* DASH_DBUS_SERVICE = "com.canonical.Unity2d.Dash";
 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)
 , m_dashActive(false)
+, m_alwaysFullScreen(false)
 {
     /* Check if the dash is already up and running by asking the bus instead of
        trying to create an instance of the interface. Creating an instance would
@@ -59,6 +65,9 @@
                                                                this);
         connect(watcher, SIGNAL(serviceRegistered(QString)), SLOT(connectToDash()));
     }
+
+    connect(QApplication::desktop(), SIGNAL(resized(int)), SLOT(updateAlwaysFullScreen()));
+    updateAlwaysFullScreen();
 }
 
 void DashClient::connectToDash()
@@ -152,4 +161,25 @@
     }
 }
 
+QSize DashClient::minimumSizeForDesktop()
+{
+    return QSize(DASH_MIN_SCREEN_WIDTH, DASH_MIN_SCREEN_HEIGHT);
+}
+
+void DashClient::updateAlwaysFullScreen()
+{
+    QRect rect = QApplication::desktop()->screenGeometry();
+    QSize minSize = minimumSizeForDesktop();
+    bool alwaysFullScreen = rect.width() < minSize.width() && rect.height() < minSize.height();
+    if (m_alwaysFullScreen != alwaysFullScreen) {
+        m_alwaysFullScreen = alwaysFullScreen;
+        Q_EMIT alwaysFullScreenChanged();
+    }
+}
+
+bool DashClient::alwaysFullScreen() const
+{
+    return m_alwaysFullScreen;
+}
+
 #include "dashclient.moc"
 
=== modified file 'libunity-2d-private/src/dashclient.h'
--- libunity-2d-private/src/dashclient.h	2011-08-11 15:36:04 +0000
+++ libunity-2d-private/src/dashclient.h	2012-01-26 18:08:33 +0000
@@ -25,6 +25,7 @@
 
 // Qt
 #include <QObject>
+#include <QSize>
 
 class QDBusInterface;
 
@@ -34,6 +35,8 @@
 class DashClient : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(bool alwaysFullScreen READ alwaysFullScreen NOTIFY alwaysFullScreenChanged)
+
 public:
     static DashClient* instance();
 
@@ -44,25 +47,29 @@
      * - "" if the dash is not visible
      */
     QString activePage() const;
-
+    bool alwaysFullScreen() const;
     void setActivePage(const QString& page, const QString& lensId=QString());
+    static QSize minimumSizeForDesktop();
 
 Q_SIGNALS:
     void activePageChanged(const QString&);
+    void alwaysFullScreenChanged();
 
 private Q_SLOTS:
     void connectToDash();
     void slotDashActiveChanged(bool);
     void slotDashActiveLensChanged(const QString&);
+    void updateAlwaysFullScreen();
 
 private:
-    DashClient(QObject* parent=0);
+    DashClient(QObject* parent = 0);
     void updateActivePage();
 
     QDBusInterface* m_dashDbusIface;
     bool m_dashActive;
     QString m_dashActiveLens;
     QString m_activePage;
+    bool m_alwaysFullScreen;
 };
 
 #endif /* DASHCLIENT_H */
 
=== removed file 'libunity-2d-private/src/dashsettings.cpp'
--- libunity-2d-private/src/dashsettings.cpp	2011-12-09 09:14:11 +0000
+++ libunity-2d-private/src/dashsettings.cpp	1970-01-01 00:00:00 +0000
@@ -1,112 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Alberto Mardegan <[e-mail]>
- *
- * 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/>.
- */
-// Self
-#include "dashsettings.h"
-
-// Local
-
-// Qt
-#include <QMetaEnum>
-#include <QSize>
-#include <QVariant>
-
-#include <config.h>
-
-static const int DASH_MIN_SCREEN_WIDTH = 1280;
-static const int DASH_MIN_SCREEN_HEIGHT = 1084;
-
-static const char* FORM_FACTOR = "formFactor";
-
-namespace Unity2d {
-
-class DashSettingsPrivate
-{
-    DashSettingsPrivate(DashSettings *dashSettings)
-    {
-        /* proxy the formFactor property signal notifier */
-        QObject::connect(&unityConfiguration(), SIGNAL(formFactorChanged(QString)),
-                         dashSettings, SIGNAL(formFactorChanged()));
-
-        /* Get the QMetaEnum for FormFactor: we will use it when setting and
-         * getting the property, to convert the string value returned by QConf
-         * to an enum value, and vice versa. */
-        const QMetaObject *metaObject = dashSettings->metaObject();
-        int index = metaObject->indexOfEnumerator("FormFactor");
-        formFactorEnum = metaObject->enumerator(index);
-    }
-
-    ~DashSettingsPrivate()
-    {
-    }
-
-private:
-    DashSettings* q_ptr;
-    Q_DECLARE_PUBLIC(DashSettings)
-
-    QMetaEnum formFactorEnum;
-};
-
-DashSettings::DashSettings(QObject* parent):
-    QObject(parent),
-    d_ptr(new DashSettingsPrivate(this))
-{
-}
-
-DashSettings::~DashSettings()
-{
-    delete d_ptr;
-}
-
-void DashSettings::setFormFactor(FormFactor formFactor)
-{
-    Q_D(DashSettings);
-
-    const char* name = d->formFactorEnum.valueToKey(formFactor);
-    unityConfiguration().setProperty(FORM_FACTOR, QVariant(QString::fromLatin1(name)));
-}
-
-DashSettings::FormFactor DashSettings::formFactor() const
-{
-    Q_D(const DashSettings);
-    QByteArray key = unityConfiguration().property(FORM_FACTOR).toString().toLatin1();
-    return FormFactor(d->formFactorEnum.keyToValue(key.constData()));
-}
-
-static int getenvInt(const char* name, int defaultValue)
-{
-    QByteArray stringValue = qgetenv(name);
-    bool ok;
-    int value = stringValue.toInt(&ok);
-    return ok ? value : defaultValue;
-}
-
-QSize DashSettings::minimumSizeForDesktop()
-{
-    static int minWidth = getenvInt("DASH_MIN_SCREEN_WIDTH",
-                                    DASH_MIN_SCREEN_WIDTH);
-    static int minHeight = getenvInt("DASH_MIN_SCREEN_HEIGHT",
-                                     DASH_MIN_SCREEN_HEIGHT);
-    return QSize(minWidth, minHeight);
-}
-
-}; // namespace Unity2d
-
-#include "dashsettings.moc"
 
=== removed file 'libunity-2d-private/src/dashsettings.h'
--- libunity-2d-private/src/dashsettings.h	2011-10-17 12:12:10 +0000
+++ libunity-2d-private/src/dashsettings.h	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Alberto Mardegan <[e-mail]>
- *
- * 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/>.
- */
-#ifndef DASHSETTINGS_H
-#define DASHSETTINGS_H
-
-// Qt
-#include <QObject>
-#include <QMetaType>
-
-namespace Unity2d {
-
-class DashSettingsPrivate;
-
-/**
- * Provide easy access to the Dash settings (from Qt and QML)
- */
-class DashSettings: public QObject
-{
-    Q_OBJECT
-
-    Q_ENUMS(FormFactor)
-
-    Q_PROPERTY(FormFactor formFactor READ formFactor WRITE setFormFactor NOTIFY formFactorChanged)
-
-public:
-    explicit DashSettings(QObject* parent = 0);
-    ~DashSettings();
-
-    enum FormFactor
-    {
-        Automatic = 0,
-        Desktop,
-        Netbook
-    };
-
-    void setFormFactor(FormFactor formFactor);
-    FormFactor formFactor() const;
-
-    static QSize minimumSizeForDesktop();
-
-Q_SIGNALS:
-    void formFactorChanged();
-
-private:
-    Q_DISABLE_COPY(DashSettings)
-    DashSettingsPrivate* d_ptr;
-    Q_DECLARE_PRIVATE(DashSettings)
-};
-
-} // namespace Unity2d
-
-Q_DECLARE_METATYPE(Unity2d::DashSettings::FormFactor)
-
-#endif /* DASHSETTINGS_H */
 
=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2012-01-13 17:33:12 +0000
+++ panel/applets/appname/appnameapplet.cpp	2012-01-26 18:08:33 +0000
@@ -28,6 +28,7 @@
 #include "panelstyle.h"
 #include "unity2dpanel.h"
 #include "windowhelper.h"
+#include "dashclient.h"
 
 // Unity-2d
 #include <debug_p.h>
@@ -226,6 +227,8 @@
     d->setupMenuBarWidget(panel->indicatorsManager());
     d->setupKeyboardModifiersMonitor();
 
+    connect(DashClient::instance(), SIGNAL(alwaysFullScreenChanged()), SLOT(updateWidgets()));
+
     QHBoxLayout* layout = new QHBoxLayout(this);
     layout->setMargin(0);
     layout->setSpacing(0);
@@ -259,7 +262,7 @@
         || d->m_menuBarWidget->isOpened()
         );
     bool showMenu = isOpened && !d->m_menuBarWidget->isEmpty() && isUserVisibleApp;
-    bool dashCanResize = d->m_windowHelper->dashCanResize();
+    bool dashCanResize = !DashClient::instance()->alwaysFullScreen();
     bool dashIsVisible = d->m_windowHelper->dashIsVisible();
     bool showWindowButtons = (isOpened && isMaximized) || dashIsVisible;
     bool showAppLabel = !(isMaximized && showMenu) && isUserVisibleApp && isOnSameScreen;
 
=== modified file 'panel/applets/appname/windowhelper.cpp'
--- panel/applets/appname/windowhelper.cpp	2011-12-02 04:22:53 +0000
+++ panel/applets/appname/windowhelper.cpp	2012-01-26 18:08:33 +0000
@@ -23,9 +23,10 @@
 #include "windowhelper.h"
 
 // Local
+#include "config.h"
 
 // unity-2d
-#include <dashsettings.h>
+#include <dashclient.h>
 #include <debug_p.h>
 #include <gconnector.h>
 #include <screeninfo.h>
@@ -45,38 +46,18 @@
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QPoint>
+#include <QVariant>
 
 // X11
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <QX11Info>
 
-using namespace Unity2d;
-
 struct WindowHelperPrivate
 {
-    void updateDashCanResize()
-    {
-        WnckScreen* screen = wnck_window_get_screen(m_window);
-        int screenNumber = wnck_screen_get_number(screen);
-        QRect rect = QApplication::desktop()->screenGeometry(screenNumber);
-
-        /* If the screen size too small, we don't allow the Dash to be used
-         * in Desktop mode (not fullscreen) */
-        QSize minSize = DashSettings::minimumSizeForDesktop();
-        if (rect.width() < minSize.width() &&
-            rect.height() < minSize.height()) {
-            m_dashCanResize = false;
-        } else {
-            m_dashCanResize = true;
-        }
-    }
-
-    DashSettings* m_dashSettings;
     WnckWindow* m_window;
     GConnector m_connector;
     bool m_activeWindowIsDash;
-    bool m_dashCanResize;
 };
 
 WindowHelper::WindowHelper(QObject* parent)
@@ -84,7 +65,6 @@
 , d(new WindowHelperPrivate)
 {
     d->m_window = 0;
-    d->m_dashSettings = new DashSettings(this);
 
     WnckScreen* screen = wnck_screen_get_default();
     wnck_screen_force_update(screen);
@@ -123,12 +103,6 @@
     QMetaObject::invokeMethod(watcher, "nameChanged");
 }
 
-static void geometryChangedCB(GObject* window,
-    WindowHelper*  watcher)
-{
-    QMetaObject::invokeMethod(watcher, "stateChanged");
-}
-
 void WindowHelper::update()
 {
     BamfWindow* bamfWindow = BamfMatcher::get_default().active_window();
@@ -143,16 +117,6 @@
 
         const char *name = wnck_window_get_name(d->m_window);
         d->m_activeWindowIsDash = qstrcmp(name, "unity-2d-places") == 0;
-        if (d->m_activeWindowIsDash) {
-            /* Since we are not really minimizing and maximizing the dash we
-             * cannot rely on the wnck "state-changed" signal to be emitted;
-             * instead, listen for the "geometry-changed" and emit our
-             * stateChanged() from that. */
-            d->m_connector.connect(G_OBJECT(d->m_window), "geometry-changed",
-                                   G_CALLBACK(geometryChangedCB), this);
-
-            d->updateDashCanResize();
-        }
 
         d->m_connector.connect(G_OBJECT(d->m_window), "name-changed", G_CALLBACK(nameChangedCB), this);
         d->m_connector.connect(G_OBJECT(d->m_window), "state-changed", G_CALLBACK(stateChangedCB), this);
@@ -167,11 +131,7 @@
         return false;
     }
     if (d->m_activeWindowIsDash) {
-        int x, y, width, height;
-        wnck_window_get_geometry(d->m_window, &x, &y, &width, &height);
-        const QRect windowGeometry(x, y, width, height);
-        ScreenInfo* screenInfo = ScreenInfo::instance();
-        return screenInfo->panelsFreeGeometry() == windowGeometry;
+        return dash2dConfiguration().property("fullScreen").toBool();
     } else {
         return wnck_window_is_maximized(d->m_window);
     }
@@ -205,11 +165,6 @@
     return d->m_window != 0 && d->m_activeWindowIsDash;
 }
 
-bool WindowHelper::dashCanResize() const
-{
-    return d->m_dashCanResize;
-}
-
 void WindowHelper::close()
 {
     guint32 timestamp = QDateTime::currentDateTime().toTime_t();
@@ -226,7 +181,7 @@
 void WindowHelper::maximize()
 {
     if (d->m_activeWindowIsDash) {
-        d->m_dashSettings->setFormFactor(DashSettings::Netbook);
+        dash2dConfiguration().setProperty("fullScreen", QVariant(true));
     } else {
         /* This currently cannot happen, because the window buttons are not
          * shown in the panel for non maximized windows. It's here just for
@@ -238,7 +193,7 @@
 void WindowHelper::unmaximize()
 {
     if (d->m_activeWindowIsDash) {
-        d->m_dashSettings->setFormFactor(DashSettings::Desktop);
+        dash2dConfiguration().setProperty("fullScreen", QVariant(false));
     } else {
         wnck_window_unmaximize(d->m_window);
     }
 
=== modified file 'panel/applets/appname/windowhelper.h'
--- panel/applets/appname/windowhelper.h	2011-10-17 12:46:55 +0000
+++ panel/applets/appname/windowhelper.h	2012-01-26 18:08:33 +0000
@@ -42,7 +42,6 @@
     bool isMaximized() const;
     bool isMostlyOnScreen(int screen) const;
     bool dashIsVisible() const;
-    bool dashCanResize() const;
 
 public Q_SLOTS:
     void close();
 
=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2011-12-19 10:54:27 +0000
+++ places/app/dashdeclarativeview.cpp	2012-01-26 18:08:33 +0000
@@ -18,9 +18,9 @@
 #include "dashadaptor.h"
 
 // unity-2d
-#include <dashsettings.h>
 #include <launcherclient.h>
 #include <screeninfo.h>
+#include <dashclient.h>
 
 // Qt
 #include <QDesktopWidget>
@@ -57,7 +57,6 @@
 
     QDesktopWidget* desktop = QApplication::desktop();
     connect(desktop, SIGNAL(resized(int)), SIGNAL(screenGeometryChanged()));
-    connect(desktop, SIGNAL(resized(int)), SLOT(updateDashModeDependingOnScreenGeometry()));
     connect(desktop, SIGNAL(workAreaResized(int)), SLOT(onWorkAreaResized(int)));
 
     updateSize();
@@ -74,18 +73,6 @@
 }
 
 void
-DashDeclarativeView::updateDashModeDependingOnScreenGeometry()
-{
-    QRect rect = QApplication::desktop()->screenGeometry(this);
-    QSize minSize = Unity2d::DashSettings::minimumSizeForDesktop();
-    if (rect.width() < minSize.width() && rect.height() < minSize.height()) {
-        setDashMode(FullScreenMode);
-    } else {
-        setDashMode(DesktopMode);
-    }
-}
-
-void
 DashDeclarativeView::updateSize()
 {
     if (m_mode == FullScreenMode) {
@@ -159,7 +146,6 @@
     if (value != m_active) {
         m_active = value;
         if (value) {
-            updateDashModeDependingOnScreenGeometry();
             show();
             raise();
             // We need a delay, otherwise the window may not be visible when we try to activate it
 
=== modified file 'places/app/dashdeclarativeview.h'
--- places/app/dashdeclarativeview.h	2011-12-08 18:39:18 +0000
+++ places/app/dashdeclarativeview.h	2012-01-26 18:08:33 +0000
@@ -68,7 +68,6 @@
 
 private Q_SLOTS:
     void onWorkAreaResized(int screen);
-    void updateDashModeDependingOnScreenGeometry();
     void updateSize();
 
 private:
 
=== modified file 'places/dash.qml'
--- places/dash.qml	2012-01-03 11:55:41 +0000
+++ places/dash.qml	2012-01-26 18:08:33 +0000
@@ -40,15 +40,11 @@
         value: (currentPage && currentPage.expanded != undefined) ? currentPage.expanded : true
     }
 
-    DashSettings {
-        id: settings
-    }
-
     Binding {
         target: dashView
         property: "dashMode"
-        value: (settings.formFactor == DashSettings.Desktop) ?
-            DashDeclarativeView.DesktopMode : DashDeclarativeView.FullScreenMode
+        value: dashClient.alwaysFullScreen || dash2dConfiguration.fullScreen ?
+               DashDeclarativeView.FullScreenMode : DashDeclarativeView.DesktopMode
     }
 
     function activatePage(page) {
 
=== added file 'tests/places/fullscreen.rb'
--- tests/places/fullscreen.rb	1970-01-01 00:00:00 +0000
+++ tests/places/fullscreen.rb	2012-01-26 18:08:33 +0000
@@ -0,0 +1,169 @@
+#!/usr/bin/env ruby1.8
+=begin
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ * - Gerry Boland <[e-mail]>
+ *
+ * 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/>.
+ */
+=end
+
+require '../run-tests.rb' unless $INIT_COMPLETED
+require 'xdo/xwindow'
+require 'xdo/keyboard'
+require 'xdo/mouse'
+require 'timeout'
+require 'tmpdir'
+require 'tempfile'
+include TDriverVerify
+
+############################# Test Suite #############################
+context "Dash fullscreen tests" do
+  pwd = File.expand_path(File.dirname(__FILE__)) + '/'
+
+  DASH_FULLSCREEN_KEY = '/com/canonical/unity-2d/dash/full-screen'
+  DASH_MIN_SCREEN_WIDTH = 1280;
+  DASH_MIN_SCREEN_HEIGHT = 1084;
+
+  # Run once at the beginning of this test suite
+  startup do
+    system 'killall unity-2d-places > /dev/null 2>&1'
+    system 'killall unity-2d-panel > /dev/null 2>&1'
+    system 'killall unity-2d-launcher > /dev/null 2>&1'
+    system 'killall unity-2d-launcher > /dev/null 2>&1'
+
+    # Minimize all windows
+    XDo::XWindow.toggle_minimize_all
+  end
+  
+  # Run once at the end of this test suite
+  shutdown do
+  end
+
+  # Run before each test case begins
+  setup do
+    @oldvalue = %x{dconf read #{DASH_FULLSCREEN_KEY}}.chop
+
+    # Execute the application
+    @sut = TDriver.sut(:Id => "sut_qt")
+    @dash = @sut.run(:name => UNITY_2D_PLACES,
+                    :arguments => "-testability",
+                    :sleeptime => 2)
+    @panel = @sut.run(:name => UNITY_2D_PANEL,
+                    :arguments => "-testability",
+                    :sleeptime => 2)
+    @launcher = @sut.run(:name => UNITY_2D_LAUNCHER,
+                         :arguments => "-testability",
+                         :sleeptime => 2)
+
+    verify(10){ @panel.Unity2dPanel() }
+    verify(10){ @launcher.Unity2dPanel() }
+    # Dash can't be verified here as the declarative view is hidden until we make it active
+  end
+
+  # Run after each test case completes
+  teardown do
+    %x{dconf write #{DASH_FULLSCREEN_KEY} #{@oldvalue}}
+    system "pkill -nf unity-2d-panel"
+    system "pkill -nf unity-2d-places"
+    system "pkill -nf unity-2d-launcher"
+  end
+
+  def dash_always_fullscreen
+    out = %x{xdotool getdisplaygeometry}
+    width, height = out.split.collect { |coord| coord.to_i }
+    return width < DASH_MIN_SCREEN_WIDTH && height < DASH_MIN_SCREEN_HEIGHT
+  end
+
+  #####################################################################################
+  # Test cases
+
+  test "Dash fullscreens on dconf key change" do
+    %x{dconf write #{DASH_FULLSCREEN_KEY} false}
+    XDo::Keyboard.super
+    sleep 1
+
+    verify_equal('true', TIMEOUT, 'Dash did not appear') {
+        @dash.DashDeclarativeView()['active']
+    }
+
+    expected = dash_always_fullscreen ? 'FullScreenMode' : 'DesktopMode'
+    verify_equal(expected, TIMEOUT, 'Dash is in the wrong fullscreen state') {
+        @dash.DashDeclarativeView()['dashMode']
+    }
+
+    %x{dconf write #{DASH_FULLSCREEN_KEY} true}
+    sleep 1
+
+    verify_equal('FullScreenMode', TIMEOUT, 'Dash is not fullscreen but should be') {
+        @dash.DashDeclarativeView()['dashMode']
+    }
+  end
+
+  test "Dash reacts correctly to panel buttons" do
+    oldvalue = %x{dconf read #{DASH_FULLSCREEN_KEY}}
+
+    %x{dconf write #{DASH_FULLSCREEN_KEY} false}
+    XDo::Keyboard.super
+    sleep 1
+    verify_equal('true', TIMEOUT, 'Dash did not appear') {
+        @dash.DashDeclarativeView()['active']
+    }
+
+    maxbutton = nil
+    verify(TIMEOUT, 'The "maximize" button did not appear when the dash was visible' ) {
+        maxbutton = @panel.AppNameApplet().children( :type => 'QAbstractButton' )[2]
+    }
+
+    maxbutton.tap if maxbutton
+    sleep 1
+    verify_equal('FullScreenMode', TIMEOUT, 'Dash should be fullsceen, but it is not' ) {
+        @dash.DashDeclarativeView()['dashMode']
+    }
+
+    # When always fullscreen tapping the max button does nothing, so the key should remain set to
+    # false.
+    expected = dash_always_fullscreen ? 'false' : 'true'
+    verify_equal(expected, TIMEOUT, 'Dash fullscreen key has the wrong value after maximize') {
+        %x{dconf read #{DASH_FULLSCREEN_KEY}}.chop
+    }
+
+    maxbutton.tap if maxbutton
+    sleep 1
+    expected = dash_always_fullscreen ? 'FullScreenMode' : 'DesktopMode'
+    verify_equal(expected, TIMEOUT, 'Dash is in the wrong fullscreen state' ) {
+        @dash.DashDeclarativeView()['dashMode']
+    }
+    verify_equal('false', TIMEOUT, 'Dash fullscreen key was not unset') {
+        %x{dconf read #{DASH_FULLSCREEN_KEY}}.chop
+    }
+  end
+
+  test "Dash fullscreen initially" do
+    %x{dconf write #{DASH_FULLSCREEN_KEY} true}
+    XDo::Keyboard.super
+    sleep 1
+
+    verify_equal('true', TIMEOUT, 'Dash did not appear') {
+        @dash.DashDeclarativeView()['active']
+    }
+    verify_equal('FullScreenMode', TIMEOUT, 'Dash initial state is wrong') {
+        @dash.DashDeclarativeView()['dashMode']
+    }
+  end
+end