Merge lp:~mardy/unity-2d/unmaximize into lp:unity-2d

[Alberto Mardegan]

(resubmitting without prerequisite branch)

  [dash, panel] Add window controls to dash window

  Show window controls for closing, minimizing and maximizing the Dash.

One potentially big issue:

Although the Dash window state (maximized/unmaximized) is set in DConf, at the next startup the Dash ignores that settings: this is because the Dash itself determines what window mode is best right after it's started. We need to clarify with the UI designers whether this behaviour is the intended one.

[Michał Sawicz (saviq)]

Works fine here. Only thing I'm not sure of - what's the purpose of minimizing the Dash?

review: Approve (functional)

[Michał Sawicz (saviq)]

> Works fine here. Only thing I'm not sure of - what's the purpose of minimizing
> the Dash?
Talking to @fboucault, the minimize button should be disabled / greyed out for the dash.

review: Needs Fixing

[Alberto Mardegan (mardy)]

I will change the minimize button not to do anything when pressed, and remove the highlight effect when hovering it.
However, I'm not sure it's the good solution, seeing bug 867910 and bug 862775.

[Alberto Mardegan (mardy)]

Merge request updated: the minimize button is now insensitive.

[Michał Sawicz (saviq)]

I agree with the bugs mentioned - the minimize button looks out-of-place - broken, not inactive, with that change. Unless we have a "inactive" state of the buttons elsewhere in the desktop - which we don't - we should simply remove the minimize button. Modal windows, for example, only have the close button, not all of them, but with only the close one working.

That will probably require ACK from design.

[Michał Sawicz (saviq)]

When we're always fullscreen (Netbook form factor?), the unmaximize button should also be disabled.

Also, when the dash or alt+f2 is active, panel still displays the "Desktop" label.

review: Needs Fixing

[Alberto Mardegan (mardy)]

Updated:
- Don't show desktop title when Dash is running
- Disable the maximize/unmaximize button when the screen resolution is too low

[Michał Sawicz (saviq)]

Functionally works great, will have to take a longer look at the code, unless someone else wants to do that :]

review: Approve (functional)

[Lohith D Shivamurthy (dyams)]

> Functionally works great, will have to take a longer look at the code, unless
> someone else wants to do that :]

I finished reviewing this MR. IMO, We should merge it already.
I have noticed a functional issue though.
But this patch itself is worth more than that small issue. :)

I can log a separate lp bug for that issue later.

[Lohith D Shivamurthy (dyams)]

The issue is :
1) Open Dash
2) Make sure its window buttons are not visible.
3) Move the mouse over panel
4) Window buttons(Close, Minimize, Maximize) not visible yet
5) Move the mouse away from panel
6) The Window buttons becomes visible now.

Expected:
at (4) the buttons should have been visible and
at (6) they should have been hidden.

Actual:
Moving the mouse over panel when window buttons are not visible, the buttons are still hidden.
When cursor is moved away, they become visible.

[Alberto Mardegan (mardy)]

I'm rather sure that the issue your found was not present when I tested this -- it's a rather big issue that wouldn't pass unnoticed.
However, unfortunately I won't be able to work on this either. :-(

[Lohith D Shivamurthy (dyams)]

The code is neat and clean. Happy to approve it.
Thanks a lot.

review: Approve

[Gerry Boland (gerboland)]

Sorry, but make check not passing yet, so merge will fail.

[Unity Merger (unity-merger)]

No proposals found for merge of lp:~mardy/unity-2d/spread-geometry into lp:unity-2d.

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2011-11-07 14:04:55 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2011-11-29 12:07:27 +0000
@@ -22,6 +22,7 @@
 */
 #include "plugin.h"
 
+#include "dashsettings.h"
 #include "launcherapplication.h"
 #include "place.h"
 #include "placeentry.h"
@@ -83,6 +84,8 @@
 
 #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,6 +103,8 @@
 {
     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

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2011-11-21 17:27:57 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2011-11-29 12:07:27 +0000
@@ -4,6 +4,7 @@
 set(lib${LIB_NAME}_SRCS
     bfb.cpp
     dashclient.cpp
+    dashsettings.cpp
     debug.cpp
     gconnector.cpp
     gimageutils.cpp

=== added file 'libunity-2d-private/src/dashsettings.cpp'
--- libunity-2d-private/src/dashsettings.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/dashsettings.cpp	2011-11-29 12:07:27 +0000
@@ -0,0 +1,117 @@
+/*
+ * 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
+
+// libdconf-qt
+#include "qconf.h"
+
+// Qt
+#include <QMetaEnum>
+#include <QSize>
+#include <QVariant>
+
+static const int DASH_MIN_SCREEN_WIDTH = 1280;
+static const int DASH_MIN_SCREEN_HEIGHT = 1084;
+
+static const char* DASH_DCONF_SCHEMA = "com.canonical.Unity";
+static const char* FORM_FACTOR = "formFactor";
+
+namespace Unity2d {
+
+class DashSettingsPrivate
+{
+    DashSettingsPrivate(DashSettings *dashSettings):
+        conf(new QConf(DASH_DCONF_SCHEMA))
+    {
+        /* proxy the formFactor property signal notifier */
+        QObject::connect(conf, 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()
+    {
+        delete conf;
+    }
+
+private:
+    DashSettings* q_ptr;
+    Q_DECLARE_PUBLIC(DashSettings)
+
+    QConf* conf;
+    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);
+    d->conf->setProperty(FORM_FACTOR, QVariant(QString::fromLatin1(name)));
+}
+
+DashSettings::FormFactor DashSettings::formFactor() const
+{
+    Q_D(const DashSettings);
+    QByteArray key = d->conf->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"

=== added file 'libunity-2d-private/src/dashsettings.h'
--- libunity-2d-private/src/dashsettings.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/dashsettings.h	2011-11-29 12:07:27 +0000
@@ -0,0 +1,72 @@
+/*
+ * 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 'libunity-2d-private/src/panelstyle.cpp'
--- libunity-2d-private/src/panelstyle.cpp	2011-09-14 16:08:49 +0000
+++ libunity-2d-private/src/panelstyle.cpp	2011-11-29 12:07:27 +0000
@@ -98,6 +98,9 @@
         case PanelStyle::UnmaximizeWindowButton:
             typeString = "unmaximize";
             break;
+        case PanelStyle::MaximizeWindowButton:
+            typeString = "maximize";
+            break;
         }
 
         switch (state) {
@@ -132,6 +135,9 @@
         case PanelStyle::UnmaximizeWindowButton:
             standardIcon = QStyle::SP_TitleBarNormalButton;
             break;
+        case PanelStyle::MaximizeWindowButton:
+            standardIcon = QStyle::SP_TitleBarMaxButton;
+            break;
         }
 
         QIcon icon = QApplication::style()->standardIcon(standardIcon);

=== modified file 'libunity-2d-private/src/panelstyle.h'
--- libunity-2d-private/src/panelstyle.h	2011-08-22 09:17:03 +0000
+++ libunity-2d-private/src/panelstyle.h	2011-11-29 12:07:27 +0000
@@ -48,7 +48,8 @@
     enum WindowButtonType {
         CloseWindowButton,
         MinimizeWindowButton,
-        UnmaximizeWindowButton
+        UnmaximizeWindowButton,
+        MaximizeWindowButton
     };
 
     enum WindowButtonState {

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-11-14 10:45:33 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-11-29 12:07:27 +0000
@@ -61,15 +61,25 @@
 public:
     WindowButton(const PanelStyle::WindowButtonType& buttonType, QWidget* parent = 0)
     : QAbstractButton(parent)
-    , m_buttonType(buttonType)
+    , m_initialized(false)
     {
-        loadPixmaps();
+        setButtonType(buttonType);
         if (buttonType == PanelStyle::MinimizeWindowButton) {
             setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
         } else {
             setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
         }
         setAttribute(Qt::WA_Hover);
+        m_initialized = true;
+    }
+
+    void setButtonType(const PanelStyle::WindowButtonType& buttonType)
+    {
+        if (m_initialized && m_buttonType == buttonType) return;
+
+        m_buttonType = buttonType;
+        loadPixmaps();
+        update();
     }
 
     QSize minimumSizeHint() const
@@ -90,10 +100,14 @@
     {
         QPainter painter(this);
         QPixmap pix;
-        if (isDown()) {
-            pix = m_downPix;
-        } else if (underMouse()) {
-            pix = m_hoverPix;
+        if (isEnabled()) {
+            if (isDown()) {
+                pix = m_downPix;
+            } else if (underMouse()) {
+                pix = m_hoverPix;
+            } else {
+                pix = m_normalPix;
+            }
         } else {
             pix = m_normalPix;
         }
@@ -111,6 +125,7 @@
     QPixmap m_normalPix;
     QPixmap m_hoverPix;
     QPixmap m_downPix;
+    bool m_initialized;
 
     void loadPixmaps()
     {
@@ -170,7 +185,7 @@
         m_windowButtonWidget->setFixedWidth(LauncherClient::MaximumWidth);
         QObject::connect(m_closeButton, SIGNAL(clicked()), m_windowHelper, SLOT(close()));
         QObject::connect(m_minimizeButton, SIGNAL(clicked()), m_windowHelper, SLOT(minimize()));
-        QObject::connect(m_maximizeButton, SIGNAL(clicked()), m_windowHelper, SLOT(unmaximize()));
+        QObject::connect(m_maximizeButton, SIGNAL(clicked()), m_windowHelper, SLOT(toggleMaximize()));
     }
 
     void setupWindowHelper()
@@ -244,13 +259,22 @@
         || d->m_menuBarWidget->isOpened()
         );
     bool showMenu = isOpened && !d->m_menuBarWidget->isEmpty() && isUserVisibleApp;
-    bool showWindowButtons = isOpened && isMaximized;
+    bool dashCanResize = d->m_windowHelper->dashCanResize();
+    bool dashIsVisible = d->m_windowHelper->dashIsVisible();
+    bool showWindowButtons = (isOpened && isMaximized) || dashIsVisible;
     bool showAppLabel = !(isMaximized && showMenu) && isUserVisibleApp && isOnSameScreen;
-    bool showDesktopLabel = !isUserVisibleApp;
+    bool showDesktopLabel = !app;
 
     d->m_windowButtonWidget->setVisible(showWindowButtons);
+    d->m_maximizeButton->setButtonType(isMaximized ?
+                                       PanelStyle::UnmaximizeWindowButton :
+                                       PanelStyle::MaximizeWindowButton);
+    /* disable the minimize button for the dash */
+    d->m_minimizeButton->setEnabled(!dashIsVisible);
+    /* and the maximize button, if the dash is not resizeable */
+    d->m_maximizeButton->setEnabled(!dashIsVisible || dashCanResize);
 
-    if (showAppLabel || showDesktopLabel) {
+    if (showAppLabel || showDesktopLabel || dashIsVisible) {
         d->m_label->setVisible(true);
         if (showAppLabel) {
             // Define text
@@ -270,6 +294,8 @@
             d->m_label->setText(text);
         } else if (showDesktopLabel) {
             d->m_label->setText(u2dTr("Desktop", "nautilus"));
+        } else {
+            d->m_label->setText("");
         }
 
         // Define label width

=== modified file 'panel/applets/appname/windowhelper.cpp'
--- panel/applets/appname/windowhelper.cpp	2011-09-27 11:57:06 +0000
+++ panel/applets/appname/windowhelper.cpp	2011-11-29 12:07:27 +0000
@@ -25,8 +25,10 @@
 // Local
 
 // unity-2d
+#include <dashsettings.h>
 #include <debug_p.h>
 #include <gconnector.h>
+#include <screeninfo.h>
 
 // Bamf
 #include <bamf-matcher.h>
@@ -49,10 +51,32 @@
 #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)
@@ -60,6 +84,7 @@
 , d(new WindowHelperPrivate)
 {
     d->m_window = 0;
+    d->m_dashSettings = new DashSettings(this);
 
     WnckScreen* screen = wnck_screen_get_default();
     wnck_screen_force_update(screen);
@@ -98,6 +123,12 @@
     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();
@@ -109,6 +140,20 @@
     }
     if (xid != 0) {
         d->m_window = wnck_window_get(xid);
+
+        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);
     }
@@ -121,7 +166,15 @@
     if (!d->m_window) {
         return false;
     }
-    return wnck_window_is_maximized(d->m_window);
+    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->availableGeometry() == windowGeometry;
+    } else {
+        return wnck_window_is_maximized(d->m_window);
+    }
 }
 
 bool WindowHelper::isMostlyOnScreen(int screen) const
@@ -147,6 +200,16 @@
     return true;
 }
 
+bool WindowHelper::dashIsVisible() const
+{
+    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();
@@ -155,12 +218,39 @@
 
 void WindowHelper::minimize()
 {
-    wnck_window_minimize(d->m_window);
+    if (!d->m_activeWindowIsDash) {
+        wnck_window_minimize(d->m_window);
+    }
+}
+
+void WindowHelper::maximize()
+{
+    if (d->m_activeWindowIsDash) {
+        d->m_dashSettings->setFormFactor(DashSettings::Netbook);
+    } else {
+        /* This currently cannot happen, because the window buttons are not
+         * shown in the panel for non maximized windows. It's here just for
+         * completeness. */
+        wnck_window_maximize(d->m_window);
+    }
 }
 
 void WindowHelper::unmaximize()
 {
-    wnck_window_unmaximize(d->m_window);
+    if (d->m_activeWindowIsDash) {
+        d->m_dashSettings->setFormFactor(DashSettings::Desktop);
+    } else {
+        wnck_window_unmaximize(d->m_window);
+    }
+}
+
+void WindowHelper::toggleMaximize()
+{
+    if (isMaximized()) {
+        unmaximize();
+    } else {
+        maximize();
+    }
 }
 
 void WindowHelper::drag(const QPoint& pos)

=== modified file 'panel/applets/appname/windowhelper.h'
--- panel/applets/appname/windowhelper.h	2011-09-23 15:00:34 +0000
+++ panel/applets/appname/windowhelper.h	2011-11-29 12:07:27 +0000
@@ -41,11 +41,15 @@
 
     bool isMaximized() const;
     bool isMostlyOnScreen(int screen) const;
+    bool dashIsVisible() const;
+    bool dashCanResize() const;
 
 public Q_SLOTS:
     void close();
     void minimize();
     void unmaximize();
+    void maximize();
+    void toggleMaximize();
     void drag(const QPoint& pos);
 
 private Q_SLOTS:

=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2011-11-18 10:54:50 +0000
+++ places/app/dashdeclarativeview.cpp	2011-11-29 12:07:27 +0000
@@ -18,6 +18,7 @@
 #include "dashadaptor.h"
 
 // unity-2d
+#include <dashsettings.h>
 #include <launcherclient.h>
 #include <screeninfo.h>
 
@@ -37,9 +38,6 @@
 
 #include <config.h>
 
-static const int DASH_MIN_SCREEN_WIDTH = 1280;
-static const int DASH_MIN_SCREEN_HEIGHT = 1084;
-
 static const int DASH_DESKTOP_WIDTH = 989;
 static const int DASH_DESKTOP_COLLAPSED_HEIGHT = 115;
 static const int DASH_DESKTOP_EXPANDED_HEIGHT = 606;
@@ -77,22 +75,12 @@
     availableGeometryChanged();
 }
 
-
-static int getenvInt(const char* name, int defaultValue)
-{
-    QByteArray stringValue = qgetenv(name);
-    bool ok;
-    int value = stringValue.toInt(&ok);
-    return ok ? value : defaultValue;
-}
-
 void
 DashDeclarativeView::updateDashModeDependingOnScreenGeometry()
 {
     QRect rect = QApplication::desktop()->screenGeometry(this);
-    static int minWidth = getenvInt("DASH_MIN_SCREEN_WIDTH", DASH_MIN_SCREEN_WIDTH);
-    static int minHeight = getenvInt("DASH_MIN_SCREEN_HEIGHT", DASH_MIN_SCREEN_HEIGHT);
-    if (rect.width() < minWidth && rect.height() < minHeight) {
+    QSize minSize = Unity2d::DashSettings::minimumSizeForDesktop();
+    if (rect.width() < minSize.width() && rect.height() < minSize.height()) {
         setDashMode(FullScreenMode);
     } else {
         setDashMode(DesktopMode);

=== modified file 'places/app/places.cpp'
--- places/app/places.cpp	2011-11-11 15:52:49 +0000
+++ places/app/places.cpp	2011-11-29 12:07:27 +0000
@@ -43,6 +43,7 @@
     Unity2dApplication::earlySetup(argc, argv);
     Unity2dApplication application(argc, argv);
     application.setApplicationName("Unity 2D Dash");
+    application.setQuitOnLastWindowClosed(false);
     QSet<QString> arguments = QSet<QString>::fromList(QCoreApplication::arguments());
 
     qmlRegisterType<DashDeclarativeView>("Unity2d", 1, 0, "DashDeclarativeView");

=== removed file 'places/artwork/fullscreen_button.png'
Binary files places/artwork/fullscreen_button.png	2011-02-11 17:29:15 +0000 and places/artwork/fullscreen_button.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'places/dash.qml'
--- places/dash.qml	2011-11-18 11:33:28 +0000
+++ places/dash.qml	2011-11-29 12:07:27 +0000
@@ -39,6 +39,17 @@
         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
+    }
+
     /* Unload the current page when closing the dash */
     Connections {
         target: dashView
@@ -294,28 +305,4 @@
             visible: dashView.expanded
         }
     }
-
-    AbstractButton {
-        id: fullScreenButton
-
-        Accessible.name: "Full Screen"
-
-        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"
-            mirror: isRightToLeft()
-        }
-
-        onClicked: {
-            dashView.dashMode = DashDeclarativeView.FullScreenMode
-        }
-    }
 }