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

[Aurélien Gâteau]

[dash] New desktop mode dash activated for higher screen resolutions. In that mode the dash does not occupy the entire screen by default. Instead it shows the search bar only when no results are visible and grows in height to show search results.

Here is the first *very rough* version of the Desktop Dash. It still needs quite some work on the QML side, but I understand this will be part of a separate merge.

It relies on compositing for now, which may or may not be available on all target machines. If need be I can flatten the background and make a fully opaque version depending on the availability of compositing.

[Florian Boucault (fboucault)]

- clicking on the Ubuntu circle-of-friends in the panel does not show a miminized version of the dash.
- clicking on a place in the launcher does not show a windowed version of the dash

review: Needs Fixing (functional)

[Florian Boucault (fboucault)]

Please add a commit message that will be used automatically when the branch lands.

[Florian Boucault (fboucault)]

In places/app/dashdeclarativeview.h:

    enum DashState {
        HiddenDash,
        CollapsedDesktopDash, /// Only search line-edit and "Shortcuts" button
        ExpandedDesktopDash, /// CollapsedDesktopDash + search results
        FullScreenDash
    };

I don't think the values need to contain 'Dash' in their names. Proposal:
- Hidden
-Collapsed
- Expanded
- Fullscreen

review: Needs Fixing (code)

[Florian Boucault (fboucault)]

In places/app/dashdeclarativeview.h:

Property dashState should not contain 'dash' in its name (similar to the 'active' property which is not named 'dashActive'). All methods (getter, setter, signal) should be renamed accordingly.

review: Needs Fixing (code)

[Florian Boucault (fboucault)]

DashDeclarativeView::onWorkAreaResized(int screen)

should take into account other states than just 'FullScreenDash'.

review: Needs Fixing (code)

[Florian Boucault (fboucault)]

DashDeclarativeView::setDashState(DashDeclarativeView::DashState state)

should call resize (calling fitToAvailableSpace or resizeToDesktopDashSize) _before_ calling 'show'.

review: Needs Fixing (code)

[Florian Boucault (fboucault)]

> DashDeclarativeView::onWorkAreaResized(int screen)
>
> should take into account other states than just 'FullScreenDash'.

If the available work area's size becomes "close enough" to the size of dash in 'desktop' state then the dash should take all the width of the screen and drop its window borders and resizing handle (similar to what happens in 'fullscreen' state).

To ease that implementation and make the code cleaner, the logic to determine if the size of the dash is "close enough" should not be part of DashDeclarativeView::setActive but factored out in a separate method.
In this merge request that code is incomplete at the moment as it only checks the resolution of the screen against a static resolution DASH_MIN_SCREEN_WIDTH/DASH_MIN_SCREEN_HEIGHT whereas it should:
 - determine whether or not the screen resolution is one of a netbook
 - if yes, then compare the size of the dash in 'desktop' state and the size of the available area and if the dash takes "most" of the available area then behave as if it were in 'fullscreen' state

Let's discuss this very soon in order to make it crystal clear.

review: Needs Fixing (code)

[Florian Boucault (fboucault)]

places/artwork/desktop_dash.sci
places/artwork/desktop_dash_background.png

Please name the sci identically to the png file. Also I think it would be clearer to name it 'border' or 'handle' rather than 'background'

review: Needs Fixing (code)

[Florian Boucault (fboucault)]

In places/app/places.cpp:

- view.setAttribute(Qt::WA_OpaquePaintEvent);
- view.setAttribute(Qt::WA_NoSystemBackground);
+ view.setAttribute(Qt::WA_TranslucentBackground);
+ view.viewport()->setAttribute(Qt::WA_TranslucentBackground);

Until Metacity has compositing activated by default that code should be conditional. Please restore the previous code by default.

review: Needs Fixing (code)

[Florian Boucault (fboucault)]

places/Home.qml

- opacity: globalSearchActive ? 0 : 1
+ opacity: globalSearchActive || dashView.dashState == DashDeclarativeView.CollapsedDesktopDash ? 0 : 1

This change does not look necessary.

[Florian Boucault (fboucault)]

places/dash.qml:

- 'shortcutsButton' should be part of the home page as it is never used in the places.
- 'expanded'/'collapsed' state management is overly complicated: a binding of dashView.dashState would suffice:

Binding {
    target: dashView
    property: "dashState"
    value: THE_RIGHT_VALUE (taken from updateDashState)
}

Though this will not be necessary as this should move to Home.qml as well as it is the only place where collapsed/expanded is relevant

review: Needs Fixing (code)

[Florian Boucault (fboucault)]

places/PlaceEntryView.qml

New 'expanded' property should be removed (as a consequence of previous comment).

review: Needs Fixing (code)

[Aurélien Gâteau (agateau)]

> - clicking on the Ubuntu circle-of-friends in the panel does not show a
> miminized version of the dash.
> - clicking on a place in the launcher does not show a windowed version of the
> dash

It works here. What is the size of your screen? maybe you fall in the "fullscreen" only case?

[Aurélien Gâteau (agateau)]

> In places/app/dashdeclarativeview.h:
>
> enum DashState {
> HiddenDash,
> CollapsedDesktopDash, /// Only search line-edit and "Shortcuts" button
> ExpandedDesktopDash, /// CollapsedDesktopDash + search results
> FullScreenDash
> };
>
>
> I don't think the values need to contain 'Dash' in their names. Proposal:
> - Hidden
> -Collapsed
> - Expanded
> - Fullscreen

I disagree. See http://doc.qt.nokia.com/qq/qq13-apis.html#theartofnaming for the rational behind these names.

[Aurélien Gâteau (agateau)]

> In places/app/dashdeclarativeview.h:
>
> Property dashState should not contain 'dash' in its name (similar to the
> 'active' property which is not named 'dashActive'). All methods (getter,
> setter, signal) should be renamed accordingly.

I disagree: "state" is too generic. I agree "dash" is not the best prefix though (same for the enums). What about renaming the whole "dashState" to "appearance" or "formFactor"?

[Aurélien Gâteau (agateau)]

> In this merge request that code is incomplete at the moment as it only checks
> the resolution of the screen against a static resolution
> DASH_MIN_SCREEN_WIDTH/DASH_MIN_SCREEN_HEIGHT whereas it should:

The spec explicitly defines these resolution limits.

[Aurélien Gâteau (agateau)]

> DashDeclarativeView::setDashState(DashDeclarativeView::DashState state)
>
> should call resize (calling fitToAvailableSpace or resizeToDesktopDashSize)
> _before_ calling 'show'.

It does not really matter because X is asynchronous: the window won't appear on the screen until we are back to the event loop.

[Aurélien Gâteau (agateau)]

> places/artwork/desktop_dash.sci
> places/artwork/desktop_dash_background.png
>
> Please name the sci identically to the png file.

Oups. I agree.

> Also I think it would be
> clearer to name it 'border' or 'handle' rather than 'background'

I choose background because the image is also used for the background of the Dash. I don't have any strong opinion on this though: pick which name you prefer.

[Aurélien Gâteau (agateau)]

> In places/app/places.cpp:
>
> - view.setAttribute(Qt::WA_OpaquePaintEvent);
> - view.setAttribute(Qt::WA_NoSystemBackground);
> + view.setAttribute(Qt::WA_TranslucentBackground);
> + view.viewport()->setAttribute(Qt::WA_TranslucentBackground);
>
> Until Metacity has compositing activated by default that code should be
> conditional. Please restore the previous code by default.

It is going to be super-ugly if I do this. Should I detect compositing and define a window mask if it's not available?

[Aurélien Gâteau (agateau)]

> places/Home.qml
>
> - opacity: globalSearchActive ? 0 : 1
> + opacity: globalSearchActive || dashView.dashState ==
> DashDeclarativeView.CollapsedDesktopDash ? 0 : 1
>
> This change does not look necessary.

It is necessary, otherwise the home buttons appears behind the search widget in Collapsed mode.

[Florian Boucault (fboucault)]

> > In places/app/dashdeclarativeview.h:
> >
> > enum DashState {
> > HiddenDash,
> > CollapsedDesktopDash, /// Only search line-edit and "Shortcuts"
> button
> > ExpandedDesktopDash, /// CollapsedDesktopDash + search results
> > FullScreenDash
> > };
> >
> >
> > I don't think the values need to contain 'Dash' in their names. Proposal:
> > - Hidden
> > -Collapsed
> > - Expanded
> > - Fullscreen
>
> I disagree. See http://doc.qt.nokia.com/qq/qq13-apis.html#theartofnaming for
> the rational behind these names.

I don't see how it applies here. Note that we are not polluting the Qt namespace here. Please detail your point.

[Florian Boucault (fboucault)]

> > - clicking on the Ubuntu circle-of-friends in the panel does not show a
> > miminized version of the dash.
> > - clicking on a place in the launcher does not show a windowed version of
> the
> > dash
>
> It works here. What is the size of your screen? maybe you fall in the
> "fullscreen" only case?

1280x800 is my screen size.

[Aurélien Gâteau (agateau)]

> > > In places/app/dashdeclarativeview.h:
> > >
> > > enum DashState {
> > > HiddenDash,
> > > CollapsedDesktopDash, /// Only search line-edit and "Shortcuts"
> > button
> > > ExpandedDesktopDash, /// CollapsedDesktopDash + search results
> > > FullScreenDash
> > > };
> > >
> > >
> > > I don't think the values need to contain 'Dash' in their names. Proposal:
> > > - Hidden
> > > -Collapsed
> > > - Expanded
> > > - Fullscreen
> >
> > I disagree. See http://doc.qt.nokia.com/qq/qq13-apis.html#theartofnaming for
> > the rational behind these names.
>
>
> I don't see how it applies here. Note that we are not polluting the Qt
> namespace here. Please detail your point.

The link I posted is not about Qt itself, it is about Qt-style API, which is what we are creating. An enum named Fullscreen or Expanded is ambiguous, hence the need for a suffix, has suggested in the "Naming Enum Types and Values" chapter of the link.

[Florian Boucault (fboucault)]

> > In places/app/dashdeclarativeview.h:
> >
> > Property dashState should not contain 'dash' in its name (similar to the
> > 'active' property which is not named 'dashActive'). All methods (getter,
> > setter, signal) should be renamed accordingly.
>
> I disagree: "state" is too generic. I agree "dash" is not the best prefix
> though (same for the enums). What about renaming the whole "dashState" to
> "appearance" or "formFactor"?

How about 'mode' or 'layout'? or 'layoutMode'?

[Florian Boucault (fboucault)]

> > places/artwork/desktop_dash.sci
> > places/artwork/desktop_dash_background.png
> >
> > Please name the sci identically to the png file.
>
> Oups. I agree.
>
> > Also I think it would be
> > clearer to name it 'border' or 'handle' rather than 'background'
>
> I choose background because the image is also used for the background of the
> Dash. I don't have any strong opinion on this though: pick which name you
> prefer.

I had not noticed it was used as background. That probably conflicts with the GnomeBackground being drawn below with a color blended into it. Let's discuss this.

[Aurélien Gâteau (agateau)]

> > > - clicking on the Ubuntu circle-of-friends in the panel does not show a
> > > miminized version of the dash.
> > > - clicking on a place in the launcher does not show a windowed version of
> > the
> > > dash
> >
> > It works here. What is the size of your screen? maybe you fall in the
> > "fullscreen" only case?
>
> 1280x800 is my screen size.

That's it: the spec says if both your screen dimensions are less than or equal to 1280 x 1024, only the fullscreen dash should be displayed.

You can work-around it through two environment variables: Start unity-2d-places like this:

DASH_MIN_SCREEN_WIDTH=640 DASH_MIN_SCREEN_HEIGHT=480 unity-2d-places

(Actually only setting the HEIGHT should be enough)

[Florian Boucault (fboucault)]

> > places/Home.qml
> >
> > - opacity: globalSearchActive ? 0 : 1
> > + opacity: globalSearchActive || dashView.dashState ==
> > DashDeclarativeView.CollapsedDesktopDash ? 0 : 1
> >
> > This change does not look necessary.
>
> It is necessary, otherwise the home buttons appears behind the search widget
> in Collapsed mode.

My bad.

[Aurélien Gâteau (agateau)]

> > > places/artwork/desktop_dash.sci
> > > places/artwork/desktop_dash_background.png
> > >
> > > Please name the sci identically to the png file.
> >
> > Oups. I agree.
> >
> > > Also I think it would be
> > > clearer to name it 'border' or 'handle' rather than 'background'
> >
> > I choose background because the image is also used for the background of the
> > Dash. I don't have any strong opinion on this though: pick which name you
> > prefer.
>
> I had not noticed it was used as background. That probably conflicts with the
> GnomeBackground being drawn below with a color blended into it. Let's discuss
> this.

Right now what happens is that GnomeBackground is not shown when in desktop mode, so it does not really conflict. That may not be what the designer had in mind though.

[Aurélien Gâteau (agateau)]

> places/dash.qml:
>
> - 'shortcutsButton' should be part of the home page as it is never used in the
> places.

This cannot be done because the home page is hidden when the shortcut button is shown.

> - 'expanded'/'collapsed' state management is overly complicated: a binding of
> dashView.dashState would suffice:
>
> Binding {
> target: dashView
> property: "dashState"
> value: THE_RIGHT_VALUE (taken from updateDashState)
> }
>
> Though this will not be necessary as this should move to Home.qml as well as
> it is the only place where collapsed/expanded is relevant

Just tried this approach and could not get it to work: it caused a loop in the binding as the computation for THE_RIGHT_VALUE needs to access dashState (to avoid changing it when we are in fullscreen mode)

>> places/artwork/desktop_dash.sci
>> places/artwork/desktop_dash_background.png
>>
>> Please name the sci identically to the png file.

> Oups. I agree.

Renamed desktop_dash.sci to desktop_dash_background.sci for now.

[Aurélien Gâteau (agateau)]

> > places/dash.qml:
> >
> > - 'shortcutsButton' should be part of the home page as it is never used in
> the
> > places.
>
> This cannot be done because the home page is hidden when the shortcut button
> is shown.

OK, I found a way to do this.
>
> > - 'expanded'/'collapsed' state management is overly complicated: a binding
> of
> > dashView.dashState would suffice:
> >
> > Binding {
> > target: dashView
> > property: "dashState"
> > value: THE_RIGHT_VALUE (taken from updateDashState)
> > }
> >
> > Though this will not be necessary as this should move to Home.qml as well as
> > it is the only place where collapsed/expanded is relevant
>
> Just tried this approach and could not get it to work: it caused a loop in the
> binding as the computation for THE_RIGHT_VALUE needs to access dashState (to
> avoid changing it when we are in fullscreen mode)

Just committed a new version, which is quite simpler and does not require change in PlaceViewEntry.qml. This was possible because I got rid of the two different Desktop states and added a separate "expanded" boolean property. Code is simpler now.

I also renamed DashState to DashMode and its values: HiddenMode, DesktopMode and FullScreenMode.

[Aurélien Gâteau (agateau)]

Added a semi decent fall-back for non composite mode. I think I addressed all your issues now.

[Florian Boucault (fboucault)]

I'm still going through the log of comments/replies, please bear with me.

One thing I noticed during functional testing is that in expanded desktop mode the 'fullscreen' button does not work anymore.

review: Needs Fixing (functional)

[Florian Boucault (fboucault)]

Looks like:

    Binding {
        target: dashView
        property: "expanded"
        value: (currentPage && currentPage.expanded != undefined) ? currentPage.expanded : true
    }

could be moved from places/dash.qml to places/Home.qml

[Florian Boucault (fboucault)]

Other than that all the other changes look great especially the simplifications to the QML which are so neat! That will make merging the work with the new look of the dash trivial.

We still have the screen size thing to discuss now that I found the lost specification again :)

[Florian Boucault (fboucault)]

After discussion it was decided the following:

In non composite mode, a different PNG image needs to be used for the border and background. It will be fully opaque and serves also as the mask. The background color (part behind the content/search results) is to be nearly black: value of 0.15.
Also in non composite mode the flags that were used before should be readded:
    /* Performance tricks */
    view.setAttribute(Qt::WA_OpaquePaintEvent);
    view.setAttribute(Qt::WA_NoSystemBackground);

Deciding whether or not to make the dash fullscreen by default should use a strict comparison instead of a greater-or-equal.

Content/search results should not overlap the border.

review: Needs Fixing

[Florian Boucault (fboucault)]

When the dash was shown, it used to receive all the key presses thus allowing the user to type a search query. With this MR it seems broken.

review: Needs Fixing (functional)

[Aurélien Gâteau (agateau)]

> Looks like:
>
> Binding {
> target: dashView
> property: "expanded"
> value: (currentPage && currentPage.expanded != undefined) ?
> currentPage.expanded : true
> }
>
>
> could be moved from places/dash.qml to places/Home.qml

The binding depends on currentPage, which is in dash.qml, so what would be the gain of moving it?

> When the dash was shown, it used to receive all the key presses thus allowing the user to type a search query. With this MR it seems broken.

Yes I noticed that. Will fix.

[Florian Boucault (fboucault)]

> > Looks like:
> >
> > Binding {
> > target: dashView
> > property: "expanded"
> > value: (currentPage && currentPage.expanded != undefined) ?
> > currentPage.expanded : true
> > }
> >
> >
> > could be moved from places/dash.qml to places/Home.qml
>
> The binding depends on currentPage, which is in dash.qml, so what would be the
> gain of moving it?

Moving it to places/Home.qml also means using a reference to the home page instead of 'currentPage'. The point here is that the behaviour is specific to the home page.

>
> > When the dash was shown, it used to receive all the key presses thus
> allowing the user to type a search query. With this MR it seems broken.
>
> Yes I noticed that. Will fix.

[Florian Boucault (fboucault)]

According to the mockups, in composite mode, the GnomeBackground should never be used, not even in fullscreen mode. dash.qml needs changing:

     GnomeBackground {
         [...]
         visible: dashView.dashMode == DashDeclarativeView.FullScreenMode
     }

review: Needs Fixing

[Florian Boucault (fboucault)]

> According to the mockups, in composite mode, the GnomeBackground should never
> be used, not even in fullscreen mode. dash.qml needs changing:
>
> GnomeBackground {
> [...]
> visible: dashView.dashMode == DashDeclarativeView.FullScreenMode
> }

    BorderImage {
        [...]
        visible: dashView.dashMode == DashDeclarativeView.DesktopMode

also needs changing to be always visible when in composite mode.

[Florian Boucault (fboucault)]

> > According to the mockups, in composite mode, the GnomeBackground should
> never
> > be used, not even in fullscreen mode. dash.qml needs changing:
> >
> > GnomeBackground {
> > [...]
> > visible: dashView.dashMode == DashDeclarativeView.FullScreenMode
> > }
>
> BorderImage {
> [...]
> visible: dashView.dashMode == DashDeclarativeView.DesktopMode
>
>
> also needs changing to be always visible when in composite mode.

Actually, that last comment is incorrect. What we need is a black background with 69% opacity.

[Aurélien Gâteau (agateau)]

> > > Looks like:
> > >
> > > Binding {
> > > target: dashView
> > > property: "expanded"
> > > value: (currentPage && currentPage.expanded != undefined) ?
> > > currentPage.expanded : true
> > > }
> > >
> > >
> > > could be moved from places/dash.qml to places/Home.qml
> >
> > The binding depends on currentPage, which is in dash.qml, so what would be
> the
> > gain of moving it?
>
> Moving it to places/Home.qml also means using a reference to the home page
> instead of 'currentPage'. The point here is that the behaviour is specific to
> the home page.

We need 'currentPage' to be able to turn expanded on when switching to the place view.

[Florian Boucault (fboucault)]

The dash now appears in the list of running applications both in the launcher and in alt+tab.

I believe this is due to revision 411.

review: Needs Fixing

[Florian Boucault (fboucault)]

> > > > Looks like:
> > > >
> > > > Binding {
> > > > target: dashView
> > > > property: "expanded"
> > > > value: (currentPage && currentPage.expanded != undefined) ?
> > > > currentPage.expanded : true
> > > > }
> > > >
> > > >
> > > > could be moved from places/dash.qml to places/Home.qml
> > >
> > > The binding depends on currentPage, which is in dash.qml, so what would be
> > the
> > > gain of moving it?
> >
> > Moving it to places/Home.qml also means using a reference to the home page
> > instead of 'currentPage'. The point here is that the behaviour is specific
> to
> > the home page.
>
> We need 'currentPage' to be able to turn expanded on when switching to the
> place view.

You are right. Sorry for overlooking this.

[Florian Boucault (fboucault)]

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.

[Florian Boucault (fboucault)]

Attempt to merge into lp:unity-2d failed due to conflicts:

text conflict in places/app/CMakeLists.txt
text conflict in places/app/places.cpp

=== modified file 'places/Home.qml'
--- places/Home.qml	2011-01-27 09:30:14 +0000
+++ places/Home.qml	2011-02-21 17:37:35 +0000
@@ -1,6 +1,7 @@
 import Qt 4.7
 import UnityApplications 1.0 /* Necessary for the ImageProvider serving image://icons/theme_name/icon_name */
 import Unity2d 1.0 /* Necessary for QSortFilterProxyModelQML */
+import Places 1.0 /* Necessary for DashDeclarativeView.*Dash */
 import gconf 1.0
 
 Item {
@@ -13,8 +14,37 @@
         }
     }
 
+    /* Set to true if shortcut buttons are visible */
+    property bool shortcutsActive: false
+
     /* Either globalSearch is shown or buttons are shown depending on globalSearchActive */
     property bool globalSearchActive: model.entrySearchQuery != ""
+    
+    /* Used by dash.qml to bind to dashView "expanded" property */
+    property bool expanded: globalSearchActive || shortcutsActive
+
+    Button {
+        id: shortcutsButton
+        anchors.bottom: parent.top
+        anchors.right: parent.right
+        anchors.rightMargin: 50
+        anchors.bottomMargin: 10
+        width: 80
+        height: 47
+
+        TextCustom {
+            text: "Shortcuts"
+            anchors.fill: parent
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        opacity: (!expanded && dashView.dashMode == DashDeclarativeView.DesktopMode) ? 1 : 0
+
+        onClicked: {
+            shortcutsActive = true
+        }
+    }
 
     ListViewWithScrollbar {
         id: globalSearch
@@ -64,7 +94,7 @@
     Flow {
         id: buttons
 
-        opacity: globalSearchActive ? 0 : 1
+        opacity: (!globalSearchActive && (shortcutsActive || dashView.dashMode == DashDeclarativeView.FullScreenMode)) ? 1 : 0
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
 

=== modified file 'places/app/CMakeLists.txt'
--- places/app/CMakeLists.txt	2011-01-10 18:25:49 +0000
+++ places/app/CMakeLists.txt	2011-02-21 17:37:35 +0000
@@ -1,6 +1,7 @@
 # Dependencies
 find_package(X11 REQUIRED)
 pkg_check_modules(QTGCONF REQUIRED libqtgconf)
+pkg_check_modules(GTK REQUIRED gtk+-2.0)
 
 # Sources
 set(places_SRCS
@@ -26,6 +27,7 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${QTGCONF_INCLUDE_DIRS}
+    ${GTK_INCLUDE_DIRS}
     )
 
 target_link_libraries(unity-2d-places
@@ -34,6 +36,7 @@
     ${QT_QTDBUS_LIBRARIES}
     ${QT_QTDECLARATIVE_LIBRARIES}
     ${QTGCONF_LDFLAGS}
+    ${GTK_LDFLAGS}
     ${X11_Xext_LIB}
     ${X11_X11_LIB}
     )

=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2011-02-01 18:18:27 +0000
+++ places/app/dashdeclarativeview.cpp	2011-02-21 17:37:35 +0000
@@ -17,6 +17,7 @@
 #include "dashdeclarativeview.h"
 #include <QDesktopWidget>
 #include <QApplication>
+#include <QBitmap>
 #include <QCloseEvent>
 #include <QDeclarativeContext>
 #include <QX11Info>
@@ -27,26 +28,63 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-DashDeclarativeView::DashDeclarativeView() :
-    QDeclarativeView(), m_active(false), m_activePlaceEntry()
+#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 = 78;
+static const int DASH_DESKTOP_EXPANDED_HEIGHT = 606;
+
+DashDeclarativeView::DashDeclarativeView()
+: QDeclarativeView()
+, m_mode(HiddenMode)
+, m_expanded(false)
 {
+    setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
+
+    if (QX11Info::isCompositingManagerRunning()) {
+        setAttribute(Qt::WA_TranslucentBackground);
+        viewport()->setAttribute(Qt::WA_TranslucentBackground);
+    } else {
+        setAttribute(Qt::WA_OpaquePaintEvent);
+        setAttribute(Qt::WA_NoSystemBackground);
+    }
+
     QDesktopWidget* desktop = QApplication::desktop();
     connect(desktop, SIGNAL(resized(int)), SIGNAL(screenGeometryChanged()));
-    connect(desktop, SIGNAL(workAreaResized(int)), SIGNAL(availableGeometryChanged()));
-}
-
-void
-DashDeclarativeView::fitToAvailableSpace(int screen)
-{
-    QDesktopWidget *desktop = QApplication::desktop();    
-    int current_screen = desktop->screenNumber(this);
-
-    if(screen == current_screen)
-    {
-        QRect geometry = desktop->availableGeometry(this);
-        setGeometry(geometry);
-        setFixedSize(geometry.size());
-    }
+    connect(desktop, SIGNAL(workAreaResized(int)), SLOT(onWorkAreaResized(int)));
+}
+
+void
+DashDeclarativeView::onWorkAreaResized(int screen)
+{
+    if (QApplication::desktop()->screenNumber(this) != screen) {
+        return;
+    }
+
+    if (m_mode == FullScreenMode) {
+        fitToAvailableSpace();
+    }
+
+    availableGeometryChanged();
+}
+
+void
+DashDeclarativeView::fitToAvailableSpace()
+{
+    setGeometry(QApplication::desktop()->availableGeometry(this));
+}
+
+void
+DashDeclarativeView::resizeToDesktopModeSize()
+{
+    QRect rect = QApplication::desktop()->availableGeometry(this);
+
+    rect.setWidth(DASH_DESKTOP_WIDTH);
+    rect.setHeight(m_expanded ? DASH_DESKTOP_EXPANDED_HEIGHT : DASH_DESKTOP_COLLAPSED_HEIGHT);
+    setGeometry(rect);
 }
 
 void
@@ -56,24 +94,89 @@
     setActive(false);
 }
 
-void
-DashDeclarativeView::setActive(bool active)
-{
-    m_active = active;
-
-    if(active)
-    {
-        emit activeChanged(active);
+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::setActive(bool value)
+{
+    if (value != active()) {
+        if (value) {
+            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) {
+                setDashMode(FullScreenMode);
+            } else {
+                setDashMode(DesktopMode);
+            }
+        } else {
+            setDashMode(HiddenMode);
+        }
+    }
+}
+
+bool
+DashDeclarativeView::active() const
+{
+    return m_mode != HiddenMode;
+}
+
+void
+DashDeclarativeView::setDashMode(DashDeclarativeView::DashMode mode)
+{
+    if (m_mode == mode) {
+        return;
+    }
+
+    m_mode = mode;
+    if (m_mode == HiddenMode) {
+        hide();
+        activeChanged(false);
+    } else {
         show();
         raise();
         activateWindow();
         forceActivateWindow();
-    }
-    else
-    {
-        hide();
-        emit activeChanged(active);
-    }
+        if (m_mode == FullScreenMode) {
+            fitToAvailableSpace();
+        } else {
+            resizeToDesktopModeSize();
+        }
+        activeChanged(true);
+    }
+    dashModeChanged(m_mode);
+}
+
+DashDeclarativeView::DashMode
+DashDeclarativeView::dashMode() const
+{
+    return m_mode;
+}
+
+void
+DashDeclarativeView::setExpanded(bool value)
+{
+    if (m_expanded == value) {
+        return;
+    }
+    
+    m_expanded = value;
+    if (m_mode == DesktopMode) {
+        resizeToDesktopModeSize();
+    }
+    expandedChanged(m_expanded);
+}
+
+bool
+DashDeclarativeView::expanded() const
+{
+    return m_expanded;
 }
 
 void
@@ -85,12 +188,6 @@
     }
 }
 
-bool
-DashDeclarativeView::active() const
-{
-    return m_active;
-}
-
 const QString&
 DashDeclarativeView::activePlaceEntry() const
 {
@@ -130,19 +227,19 @@
 DashDeclarativeView::activatePlaceEntry(const QString& file, const QString& entry, const int section)
 {
     QGraphicsObject* dash = rootObject();
-    setActive(true);
     QMetaObject::invokeMethod(dash, "activatePlaceEntry", Qt::AutoConnection,
                               Q_ARG(QVariant, QVariant::fromValue(file)),
                               Q_ARG(QVariant, QVariant::fromValue(entry)),
                               Q_ARG(QVariant, QVariant::fromValue(section)));
+    setActive(true);
 }
 
 void
 DashDeclarativeView::activateHome()
 {
     QGraphicsObject* dash = rootObject();
-    setActive(true);
     QMetaObject::invokeMethod(dash, "activateHome", Qt::AutoConnection);
+    setActive(true);
 }
 
 const QRect
@@ -171,3 +268,54 @@
             break;
     }
 }
+
+void
+DashDeclarativeView::resizeEvent(QResizeEvent* event)
+{
+    if (!QX11Info::isCompositingManagerRunning()) {
+        updateMask();
+    }
+    QDeclarativeView::resizeEvent(event);
+}
+
+static QBitmap
+createCornerMask()
+{
+    QPixmap pix(unity2dDirectory() + "/places/artwork/desktop_dash_background_no_transparency.png");
+    return pix.createMaskFromColor(Qt::red, Qt::MaskOutColor);
+}
+
+void
+DashDeclarativeView::updateMask()
+{
+    if (m_mode == FullScreenMode) {
+        clearMask();
+        return;
+    }
+    QBitmap bmp(size());
+    {
+        static QBitmap corner = createCornerMask();
+        static QBitmap top = corner.copy(0, 0, corner.width(), 1);
+        static QBitmap left = corner.copy(0, 0, 1, corner.height());
+
+        const int cornerX = bmp.width() - corner.width();
+        const int cornerY = bmp.height() - corner.height();
+
+        QPainter painter(&bmp);
+        painter.fillRect(bmp.rect(), Qt::color1);
+        painter.setBackgroundMode(Qt::OpaqueMode);
+        painter.setBackground(Qt::color1);
+        painter.setPen(Qt::color0);
+        painter.drawPixmap(cornerX, cornerY, corner);
+
+        painter.drawTiledPixmap(cornerX, 0, top.width(), cornerY, top);
+        painter.drawTiledPixmap(0, cornerY, cornerX, left.height(), left);
+    }
+    setMask(bmp);
+}
+
+bool
+DashDeclarativeView::isCompositingManagerRunning() const
+{
+    return QX11Info::isCompositingManagerRunning();
+}

=== modified file 'places/app/dashdeclarativeview.h'
--- places/app/dashdeclarativeview.h	2011-02-01 18:18:27 +0000
+++ places/app/dashdeclarativeview.h	2011-02-21 17:37:35 +0000
@@ -22,46 +22,69 @@
 class DashDeclarativeView : public QDeclarativeView
 {
     Q_OBJECT
+    Q_ENUMS(DashMode)
 
     Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity2d.Dash")
     Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+    Q_PROPERTY(bool expanded READ expanded WRITE setExpanded NOTIFY expandedChanged)
+    Q_PROPERTY(DashMode dashMode READ dashMode WRITE setDashMode NOTIFY dashModeChanged)
     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)
 
 public:
+    enum DashMode {
+        HiddenMode,
+        DesktopMode,
+        FullScreenMode
+    };
     explicit DashDeclarativeView();
 
     /* getters */
     bool active() const;
+    DashMode dashMode() const;
     const QString& activePlaceEntry() const;
     const QRect screenGeometry() const;
     const QRect availableGeometry() const;
+    bool expanded() const;
+    bool isCompositingManagerRunning() const;
 
     /* setters */
     Q_SLOT void setActive(bool active);
+    Q_INVOKABLE void setDashMode(DashMode);
     Q_INVOKABLE void setActivePlaceEntry(const QString& activePlaceEntry);
+    Q_INVOKABLE void setExpanded(bool);
 
     /* methods */
     Q_INVOKABLE void activatePlaceEntry(const QString& file, const QString& entry, const int section = 0);
     Q_INVOKABLE void activateHome();
 
-signals:
+Q_SIGNALS:
     void activeChanged(bool);
+    void dashModeChanged(DashMode);
+    void expandedChanged(bool);
     void activePlaceEntryChanged(const QString&);
 
     void screenGeometryChanged();
     void availableGeometryChanged();
 
-public slots:
-    void fitToAvailableSpace(int screen);
+protected:
+    void resizeEvent(QResizeEvent*);
+
+private Q_SLOTS:
+    void onWorkAreaResized(int screen);
 
 private:
+    void fitToAvailableSpace();
+    void resizeToDesktopModeSize();
     void forceActivateWindow();
     void focusOutEvent(QFocusEvent* event);
     void keyPressEvent(QKeyEvent* event);
+    void updateMask();
 
-    bool m_active;
+    DashMode m_mode;
+    bool m_expanded;
     QString m_activePlaceEntry; /* D-Bus object path of the place entry */
 };
 

=== modified file 'places/app/places.cpp'
--- places/app/places.cpp	2011-02-02 16:57:00 +0000
+++ places/app/places.cpp	2011-02-21 17:37:35 +0000
@@ -19,6 +19,7 @@
 
 #include <QApplication>
 #include <QDebug>
+#include <QtDeclarative>
 #include <QDeclarativeEngine>
 #include <QDeclarativeView>
 #include <QDesktopWidget>
@@ -29,6 +30,9 @@
 
 #include <X11/Xlib.h>
 
+#undef signals
+#include <gtk/gtk.h>
+
 #include "dashdeclarativeview.h"
 #include "superkeymonitor.h"
 
@@ -90,6 +94,8 @@
 
 int main(int argc, char *argv[])
 {
+    /* gtk needs to be inited, otherwise we get an assert failure in gdk */
+    gtk_init(&argc, &argv);
     QApplication::setApplicationName("Unity 2D Dash");
     qInstallMsgHandler(globalMessageHandler);
 
@@ -104,20 +110,13 @@
     QApplication::setGraphicsSystem("raster");
     QApplication application(argc, argv);
 
+    qmlRegisterType<DashDeclarativeView>("Places", 1, 0, "DashDeclarativeView");
     DashDeclarativeView view;
 
     if (!registerDBusService(&view)) {
         return -1;
     }
 
-    /* The dash window is borderless and not moveable by the user, yet not
-       fullscreen */
-    view.setAttribute(Qt::WA_X11NetWmWindowTypeDock, true);
-
-    /* Performance tricks */
-    view.setAttribute(Qt::WA_OpaquePaintEvent);
-    view.setAttribute(Qt::WA_NoSystemBackground);
-
     view.engine()->addImportPath(unity2dImportPath());
     /* Note: baseUrl seems to be picky: if it does not end with a slash,
        setSource() will fail */
@@ -137,11 +136,6 @@
     view.rootContext()->setContextProperty("engineBaseUrl", view.engine()->baseUrl().toLocalFile());
     view.setSource(QUrl("./dash.qml"));
 
-    /* Always match the size of the desktop */
-    int current_screen = QApplication::desktop()->screenNumber(&view);
-    view.fitToAvailableSpace(current_screen);
-    QObject::connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), &view, SLOT(fitToAvailableSpace(int)));
-
     /* Grab the "super" keys */
     SuperKeyMonitor superKeys; /* Just needs to be instantiated to work. */
     QAbstractEventDispatcher::instance()->setEventFilter(eventFilter);

=== added file 'places/artwork/desktop_dash_background.png'
Binary files places/artwork/desktop_dash_background.png	1970-01-01 00:00:00 +0000 and places/artwork/desktop_dash_background.png	2011-02-21 17:37:35 +0000 differ
=== added file 'places/artwork/desktop_dash_background.sci'
--- places/artwork/desktop_dash_background.sci	1970-01-01 00:00:00 +0000
+++ places/artwork/desktop_dash_background.sci	2011-02-21 17:37:35 +0000
@@ -0,0 +1,7 @@
+border.left: 0
+border.top: 0
+border.bottom: 46
+border.right: 46
+source: desktop_dash_background.png
+horizontalTileRule: Repeat
+verticalTileRule: Repeat

=== added file 'places/artwork/desktop_dash_background_mask.png'
Binary files places/artwork/desktop_dash_background_mask.png	1970-01-01 00:00:00 +0000 and places/artwork/desktop_dash_background_mask.png	2011-02-21 17:37:35 +0000 differ
=== added file 'places/artwork/desktop_dash_background_no_transparency.png'
Binary files places/artwork/desktop_dash_background_no_transparency.png	1970-01-01 00:00:00 +0000 and places/artwork/desktop_dash_background_no_transparency.png	2011-02-21 17:37:35 +0000 differ
=== added file 'places/artwork/desktop_dash_background_no_transparency.sci'
--- places/artwork/desktop_dash_background_no_transparency.sci	1970-01-01 00:00:00 +0000
+++ places/artwork/desktop_dash_background_no_transparency.sci	2011-02-21 17:37:35 +0000
@@ -0,0 +1,7 @@
+border.left: 0
+border.top: 0
+border.bottom: 46
+border.right: 46
+source: desktop_dash_background_no_transparency.png
+horizontalTileRule: Repeat
+verticalTileRule: Repeat

=== added file 'places/artwork/fullscreen_button.png'
Binary files places/artwork/fullscreen_button.png	1970-01-01 00:00:00 +0000 and places/artwork/fullscreen_button.png	2011-02-21 17:37:35 +0000 differ
=== modified file 'places/dash.qml'
--- places/dash.qml	2011-02-01 18:18:27 +0000
+++ places/dash.qml	2011-02-21 17:37:35 +0000
@@ -1,11 +1,18 @@
 import Qt 4.7
 import UnityApplications 1.0 /* Necessary for LauncherPlacesList */
+import Places 1.0 /* Necessary for DashDeclarativeView.*Dash */
 
 Item {
     id: dash
 
     property variant currentPage
 
+    Binding {
+        target: dashView
+        property: "expanded"
+        value: (currentPage && currentPage.expanded != undefined) ? currentPage.expanded : true
+    }
+
     function activatePage(page) {
         if (page == currentPage) {
             return
@@ -50,6 +57,7 @@
         /* Take advantage of the fact that the loaded qml is local and setting
            the source loads it immediately making pageLoader.item valid */
         activatePage(pageLoader.item)
+        pageLoader.item.shortcutsActive = false
         dashView.activePlaceEntry = ""
     }
 
@@ -61,6 +69,13 @@
         anchors.fill: parent
         overlay_color: "black"
         overlay_alpha: 0.71
+        visible: dashView.dashMode == DashDeclarativeView.FullScreenMode
+    }
+
+    BorderImage {
+        anchors.fill: parent
+        visible: dashView.dashMode == DashDeclarativeView.DesktopMode
+        source: dashView.isCompositingManagerRunning ? "artwork/desktop_dash_background.sci" : "artwork/desktop_dash_background_no_transparency.sci"
     }
 
     Item {
@@ -80,11 +95,30 @@
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.leftMargin: 3
-            anchors.right: parent.right
-            anchors.rightMargin: 4
+            width: 616
             height: 47
         }
 
+        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