Merge lp:~nick-dedekind/unity8/shell_chrome into lp:unity8

[Nick Dedekind]

Add support for low shell chrome.

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~nick-dedekind/unity-api/shell_chrome/+merge/286309
https://code.launchpad.net/~nick-dedekind/qtmir/shell_chrome/+merge/286307
https://code.launchpad.net/~nick-dedekind/qtubuntu/shell_chrome/+merge/286308

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
No

[lp:~nick-dedekind/unity8/shell_chrome]

2208. By Nick Dedekind on 2016-02-17

whitespace

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2207
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/403/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/543/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/566
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/585
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/585
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/581/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/581/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/581/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/581/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/581/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/581/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/403/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2208
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/406/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/549/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/572
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/590
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/590
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/586/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/586/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/586/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/586/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/586/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/586/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/406/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2207
http://jenkins.qa.ubuntu.com/job/unity8-ci/7340/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6533/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/755/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/2045/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/748/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1940/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1940/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/747/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/746/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6544/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/753/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7340/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2208
http://jenkins.qa.ubuntu.com/job/unity8-ci/7345/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6538/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/760/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/2050/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/753/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1945/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1945/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/752/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/751/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6549/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/758/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7345/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

+++ qml/Shell.qml
+ property string qmlComponent: {
could be readonly.

+++ qml/Stages/AbstractStage.qml
+ signal stageUnloaded
Why can you not depend on the already-existing Component.onDestruction signal? Is it happening too late?

Also when this is fired, the stage as not yet been unloaded. stageAboutToBeUnloaded would be a more accurate name :)

So I see you use it here:
+ property bool saveStateOnDestruction: true
+ Connections {
+ target: root
+ onStageUnloaded: {
+ resizeArea.saveWindowState();
+ resizeArea.saveStateOnDestruction = false;
+ fullscreenPolicy.active = false;
+ }
+ }
+ Component.onDestruction: {
+ if (saveStateOnDestruction) {
+ saveWindowState();
+ }
+ }
this is strange code. It looks like you are waiting for 2 events to save the windowState, and save on the first event. This is really strange looking, you need to justify it, and why Component.onDestruction is not enough. I do know that object destruction order is not guaranteed, is that it? If so, then why use it at all?

+++ qml/Stages/DesktopFullscreenPolicy.qml
this doesn't need to be an item, it doesn't contain anything visual. This can just be a single QtObject. You might be able to import QtQml instead of QtQuick too. lastSurface can be readonly too. Indent of the 'if" statement not clear.

I don't understand why it doesn't apply on the first surface. Could you also write a comment to explain the policy?

+++ qml/Stages/PhoneFullscreenPolicy.qml
I also suspect this could be a QtObject (am not sure if Connections will work inside QtObject though). It is odd to see "PhoneFullscreenPolicy" mentioned in TabletStage - would there be a better name? I'd also like a textual comment explaining what the policy is doing.

Why does this not have the first surface branch the Desktop policy has?

=== modified file 'qml/Stages/DesktopStage.qml'
- property alias requestedWidth: decoratedWindow.requestedWidth
- property alias requestedHeight: decoratedWindow.requestedHeight
+ property int requestedWidth: -1
+ property int requestedHeight: -1
why? You overriding the requested width/height? Or just because you animate them?

+++ tests/qmltests/tst_Shell.qml
just to confirm you mean to return the bool result of the comparison:
+ controls.focusedSurface.state === Mir.FullscreenState
Do we all know that JS returns the result of the last statement, if nothing is explicitly returned?

[Gerry Boland (gerboland)]

I still need to test on devices

Unmerged revisions

2200. By Launchpad Translations on behalf of unity-team on 2016-02-16

Launchpad automatic translations update.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-12 00:12:30 +0000
+++ CMakeLists.txt	2016-02-17 14:46:08 +0000
@@ -57,7 +57,7 @@
 find_package(Qt5Concurrent 5.4 REQUIRED)
 find_package(Qt5Sql 5.4 REQUIRED)
 
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=13)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=14)
 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
 pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)

=== modified file 'debian/control'
--- debian/control	2016-02-12 00:12:30 +0000
+++ debian/control	2016-02-17 14:46:08 +0000
@@ -29,7 +29,7 @@
                libqt5xmlpatterns5-dev,
                libsystemsettings-dev,
                libudev-dev,
-               libunity-api-dev (>= 7.106),
+               libunity-api-dev (>= 7.107),
                libusermetricsoutput1-dev,
 # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                libx11-dev[!armhf],
@@ -131,7 +131,7 @@
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
          qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
          ubuntu-thumbnailer-impl-0,
-         unity-application-impl-13,
+         unity-application-impl-14,
          unity-notifications-impl-3,
          unity-plugin-scopes | unity-scopes-impl,
          unity-scopes-impl-9,
@@ -177,7 +177,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-application-impl,
-          unity-application-impl-13,
+          unity-application-impl-14,
 Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
 Description: Fake environment for running Unity 8 shell
  Provides fake implementations of some QML modules used by Unity 8 shell

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-01-28 18:25:14 +0000
+++ qml/Shell.qml	2016-02-17 14:46:08 +0000
@@ -242,7 +242,7 @@
             property string usageScenario: shell.usageScenario === "phone" || greeter.hasLockedApp
                                            ? "phone"
                                            : shell.usageScenario
-            source: {
+            property string qmlComponent: {
                 if(shell.mode === "greeter") {
                     return "Stages/ShimStage.qml"
                 } else if (applicationsDisplayLoader.usageScenario === "phone") {
@@ -253,6 +253,10 @@
                     return "Stages/DesktopStage.qml";
                 }
             }
+            onQmlComponentChanged: {
+                if (item) item.stageUnloaded();
+                source = qmlComponent;
+            }
 
             property bool interactive: tutorial.spreadEnabled
                     && (!greeter || !greeter.shown)

=== modified file 'qml/Stages/AbstractStage.qml'
--- qml/Stages/AbstractStage.qml	2016-01-14 13:03:20 +0000
+++ qml/Stages/AbstractStage.qml	2016-02-17 14:46:08 +0000
@@ -49,6 +49,8 @@
                                       | Qt.InvertedPortraitOrientation
                                       | Qt.InvertedLandscapeOrientation
 
+    signal stageUnloaded
+
     // Shared code for use in stage implementations
     GSettings {
         id: lifecycleExceptions

=== added file 'qml/Stages/DesktopFullscreenPolicy.qml'
--- qml/Stages/DesktopFullscreenPolicy.qml	1970-01-01 00:00:00 +0000
+++ qml/Stages/DesktopFullscreenPolicy.qml	2016-02-17 14:46:08 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * 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/>.
+ */
+
+import QtQuick 2.4
+import Unity.Application 0.1
+
+Item {
+    property bool active: true
+    property QtObject application: null
+
+    QtObject {
+        id: priv
+        property bool firstTimeSurface: true
+        property var lastSurface: application && application.session ?
+                                      application.session.lastSurface : null
+        onLastSurfaceChanged: {
+            if (!active || !lastSurface) return;
+            if (!firstTimeSurface) return;
+            firstTimeSurface = false;
+
+            if (lastSurface.state === Mir.FullscreenState &&
+                lastSurface.shellChrome === Mir.LowChrome) {
+                lastSurface.state = Mir.RestoredState;
+            }
+        }
+    }
+}

=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	2016-02-03 14:00:47 +0000
+++ qml/Stages/DesktopStage.qml	2016-02-17 14:46:08 +0000
@@ -254,8 +254,8 @@
                 focus: appId === priv.focusedAppId
                 width: decoratedWindow.width
                 height: decoratedWindow.height
-                property alias requestedWidth: decoratedWindow.requestedWidth
-                property alias requestedHeight: decoratedWindow.requestedHeight
+                property int requestedWidth: -1
+                property int requestedHeight: -1
                 property alias minimumWidth: decoratedWindow.minimumWidth
                 property alias minimumHeight: decoratedWindow.minimumHeight
                 property alias maximumWidth: decoratedWindow.maximumWidth
@@ -372,20 +372,40 @@
                         PropertyChanges {
                             target: appDelegate;
                             x: 0; y: 0;
-                            requestedWidth: root.width; requestedHeight: root.height;
                             visuallyMinimized: false;
                             visuallyMaximized: true
                         }
+                        PropertyChanges {
+                            target: decoratedWindow
+                            requestedWidth: root.width;
+                            requestedHeight: root.height;
+                        }
                     },
                     State {
                         name: "maximizedLeft"; when: appDelegate.maximizedLeft && !appDelegate.minimized
-                        PropertyChanges { target: appDelegate; x: 0; y: PanelState.panelHeight;
-                            requestedWidth: root.width/2; requestedHeight: root.height - PanelState.panelHeight }
+                        PropertyChanges {
+                            target: appDelegate;
+                            x: 0;
+                            y: PanelState.panelHeight;
+                        }
+                        PropertyChanges {
+                            target: decoratedWindow
+                            requestedWidth: root.width/2
+                            requestedHeight: root.height - PanelState.panelHeight
+                        }
                     },
                     State {
                         name: "maximizedRight"; when: appDelegate.maximizedRight && !appDelegate.minimized
-                        PropertyChanges { target: appDelegate; x: root.width/2; y: PanelState.panelHeight;
-                            requestedWidth: root.width/2; requestedHeight: root.height - PanelState.panelHeight }
+                        PropertyChanges {
+                            target: appDelegate;
+                            x: root.width/2;
+                            y: PanelState.panelHeight
+                        }
+                        PropertyChanges {
+                            target: decoratedWindow
+                            requestedWidth: root.width/2;
+                            requestedHeight: root.height - PanelState.panelHeight
+                        }
                     },
                     State {
                         name: "minimized"; when: appDelegate.minimized
@@ -405,13 +425,17 @@
                         enabled: appDelegate.animationsEnabled
                         PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
                         UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
+                        UbuntuNumberAnimation { target: decoratedWindow; properties: "requestedWidth,requestedHeight"; duration: UbuntuAnimation.FastDuration }
                     },
                     Transition {
                         to: "minimized"
                         enabled: appDelegate.animationsEnabled
                         PropertyAction { target: appDelegate; property: "visuallyMaximized" }
                         SequentialAnimation {
-                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
+                            ParallelAnimation {
+                                UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,scale"; duration: UbuntuAnimation.FastDuration }
+                                UbuntuNumberAnimation { target: decoratedWindow; properties: "requestedWidth,requestedHeight"; duration: UbuntuAnimation.FastDuration }
+                            }
                             PropertyAction { target: appDelegate; property: "visuallyMinimized" }
                             ScriptAction {
                                 script: {
@@ -427,7 +451,10 @@
                         enabled: appDelegate.animationsEnabled
                         PropertyAction { target: appDelegate; property: "visuallyMinimized" }
                         SequentialAnimation {
-                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
+                            ParallelAnimation {
+                                UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,scale"; duration: UbuntuAnimation.FastDuration }
+                                UbuntuNumberAnimation { target: decoratedWindow; properties: "requestedWidth,requestedHeight"; duration: UbuntuAnimation.FastDuration }
+                            }
                             PropertyAction { target: appDelegate; property: "visuallyMaximized" }
                         }
                     }
@@ -442,6 +469,7 @@
                 }
 
                 WindowResizeArea {
+                    id: resizeArea
                     objectName: "windowResizeArea"
                     target: appDelegate
                     minWidth: units.gu(10)
@@ -452,6 +480,21 @@
                     screenHeight: root.height
 
                     onPressed: { ApplicationManager.focusApplication(model.appId) }
+
+                    property bool saveStateOnDestruction: true
+                    Connections {
+                        target: root
+                        onStageUnloaded: {
+                            resizeArea.saveWindowState();
+                            resizeArea.saveStateOnDestruction = false;
+                            fullscreenPolicy.active = false;
+                        }
+                    }
+                    Component.onDestruction: {
+                        if (saveStateOnDestruction) {
+                            saveWindowState();
+                        }
+                    }
                 }
 
                 DecoratedWindow {
@@ -463,12 +506,21 @@
                     active: ApplicationManager.focusedApplicationId === model.appId
                     focus: true
 
+                    requestedWidth: appDelegate.requestedWidth
+                    requestedHeight: appDelegate.requestedHeight
+
                     onClose: ApplicationManager.stopApplication(model.appId)
                     onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
                                 ? appDelegate.restoreFromMaximized() : appDelegate.maximize()
                     onMinimize: appDelegate.minimize()
                     onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }
                 }
+
+                DesktopFullscreenPolicy {
+                    id: fullscreenPolicy
+                    active: true
+                    application: decoratedWindow.application
+                }
             }
         }
     }

=== added file 'qml/Stages/PhoneFullscreenPolicy.qml'
--- qml/Stages/PhoneFullscreenPolicy.qml	1970-01-01 00:00:00 +0000
+++ qml/Stages/PhoneFullscreenPolicy.qml	2016-02-17 14:46:08 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * 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/>.
+ */
+
+import QtQuick 2.4
+import Unity.Application 0.1
+
+Item {
+    property bool active: true
+    property QtObject application: null
+
+    QtObject {
+        id: priv
+        property var lastSurface: application && application.session ?
+                                  application.session.lastSurface : null
+        onLastSurfaceChanged: {
+            if (!active || !lastSurface) return;
+            if (lastSurface.shellChrome === Mir.LowChrome) {
+                lastSurface.state = Mir.FullscreenState;
+            }
+        }
+    }
+
+    Connections {
+        target: priv.lastSurface
+        onShellChromeChanged: {
+            if (!active || !priv.lastSurface) return;
+            if (priv.lastSurface.shellChrome === Mir.LowChrome || priv.lastSurface.state == Mir.FullscreenState) {
+                priv.lastSurface.state = Mir.FullscreenState;
+            } else {
+                priv.lastSurface.state = Mir.RestoredState;
+            }
+        }
+        onStateChanged: {
+            if (!active) return;
+            if (priv.lastSurface.state === Mir.RestoredState && priv.lastSurface.shellChrome === Mir.LowChrome) {
+                priv.lastSurface.state = Mir.FullscreenState;
+            }
+        }
+    }
+}

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2016-01-14 13:03:20 +0000
+++ qml/Stages/PhoneStage.qml	2016-02-17 14:46:08 +0000
@@ -580,6 +580,16 @@
                         property: "focusedAppOrientationChangesEnabled"
                         value: orientationChangesEnabled
                     }
+
+                    PhoneFullscreenPolicy {
+                        id: fullscreenPolicy
+                        application: appDelegate.application
+
+                        Connections {
+                            target: root
+                            onStageUnloaded: fullscreenPolicy.active = false
+                        }
+                    }
                 }
             }
         }

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2016-01-14 13:03:20 +0000
+++ qml/Stages/TabletStage.qml	2016-02-17 14:46:08 +0000
@@ -743,6 +743,16 @@
                         period: (spreadView.positionMarker2 - spreadView.positionMarker1) / 3
                         progress: spreadTile.progress - spreadView.positionMarker1
                     }
+
+                    PhoneFullscreenPolicy {
+                        id: fullscreenPolicy
+                        application: spreadTile.application
+
+                        Connections {
+                            target: root
+                            onStageUnloaded: fullscreenPolicy.active = false
+                        }
+                    }
                 }
             }
         }

=== modified file 'qml/Stages/WindowResizeArea.qml'
--- qml/Stages/WindowResizeArea.qml	2016-02-03 14:00:47 +0000
+++ qml/Stages/WindowResizeArea.qml	2016-02-17 14:46:08 +0000
@@ -84,7 +84,7 @@
         priv.updateNormalGeometry();
     }
 
-    Component.onDestruction: {
+    function saveWindowState() {
         windowStateStorage.saveState(root.windowId, target.state == "maximized" ? WindowStateStorage.WindowStateMaximized : WindowStateStorage.WindowStateNormal)
         windowStateStorage.saveGeometry(root.windowId, Qt.rect(priv.normalX, priv.normalY, priv.normalWidth, priv.normalHeight))
     }

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-01-22 19:44:56 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-02-17 14:46:08 +0000
@@ -44,6 +44,7 @@
     , m_isTouchApp(true)
     , m_exemptFromLifecycle(false)
     , m_manualSurfaceCreation(false)
+    , m_shellChrome(Mir::NormalChrome)
 {
 }
 
@@ -63,6 +64,7 @@
     , m_isTouchApp(true)
     , m_exemptFromLifecycle(false)
     , m_manualSurfaceCreation(false)
+    , m_shellChrome(Mir::NormalChrome)
 {
 }
 
@@ -102,9 +104,11 @@
     if (m_session) {
         m_session->setApplication(this);
         m_session->setParent(this);
+        m_session->setFullscreen(m_fullscreen);
         SessionManager::singleton()->registerSession(m_session);
         connect(m_session, &Session::surfaceAdded,
                 this, &ApplicationInfo::onSessionSurfaceAdded);
+        connect(m_session, &Session::fullscreenChanged, this, &ApplicationInfo::fullscreenChanged);
 
         if (!m_manualSurfaceCreation) {
             QTimer::singleShot(500, m_session, &Session::createSurface);
@@ -191,12 +195,17 @@
 
 void ApplicationInfo::setFullscreen(bool value)
 {
-    if (value != m_fullscreen) {
-        m_fullscreen = value;
-        Q_EMIT fullscreenChanged(value);
+    m_fullscreen = value;
+    if (m_session) {
+        m_session->setFullscreen(value);
     }
 }
 
+bool ApplicationInfo::fullscreen() const
+{
+    return m_session ? m_session->fullscreen() : false;
+}
+
 void ApplicationInfo::setManualSurfaceCreation(bool value)
 {
     if (value != m_manualSurfaceCreation) {
@@ -262,6 +271,7 @@
         } else {
             setState(Suspended);
         }
+        surface->setShellChrome(m_shellChrome);
     }
 }
 
@@ -291,3 +301,11 @@
         Q_EMIT initialSurfaceSizeChanged(m_initialSurfaceSize);
     }
 }
+
+void ApplicationInfo::setShellChrome(Mir::ShellChrome shellChrome)
+{
+    m_shellChrome = shellChrome;
+    if (m_session && m_session->lastSurface()) {
+        m_session->lastSurface()->setShellChrome(shellChrome);
+    }
+}

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
--- tests/mocks/Unity/Application/ApplicationInfo.h	2016-01-19 21:41:34 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2016-02-17 14:46:08 +0000
@@ -24,6 +24,7 @@
 
 // unity-api
 #include <unity/shell/application/ApplicationInfoInterface.h>
+#include <unity/shell/application/Mir.h>
 
 using namespace unity::shell::application;
 
@@ -78,7 +79,7 @@
     QString screenshot() const { return m_screenshotFileName; }
 
     void setFullscreen(bool value);
-    bool fullscreen() const { return m_fullscreen; }
+    bool fullscreen() const;
 
     Qt::ScreenOrientations supportedOrientations() const override;
     void setSupportedOrientations(Qt::ScreenOrientations orientations);
@@ -97,6 +98,8 @@
 
     QSize initialSurfaceSize() const override;
     void setInitialSurfaceSize(const QSize &size) override;
+
+    Q_INVOKABLE void setShellChrome(Mir::ShellChrome shellChrome);
 public:
     void setSession(Session* session);
     Session* session() const { return m_session; }
@@ -134,6 +137,7 @@
     QSize m_initialSurfaceSize;
 
     bool m_manualSurfaceCreation;
+    Mir::ShellChrome m_shellChrome;
 };
 
 Q_DECLARE_METATYPE(ApplicationInfo*)

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2015-12-03 18:10:39 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2016-02-17 14:46:08 +0000
@@ -336,6 +336,7 @@
     application->setName("Camera");
     application->setScreenshotId("camera");
     application->setIconId("camera");
+    application->setShellChrome(Mir::LowChrome);
     application->setFullscreen(true);
     application->setSupportedOrientations(Qt::PortraitOrientation
                                         | Qt::LandscapeOrientation
@@ -349,7 +350,7 @@
     application->setName("Gallery");
     application->setScreenshotId("gallery");
     application->setIconId("gallery");
-    application->setFullscreen(true);
+    application->setShellChrome(Mir::LowChrome);
     application->setStage(ApplicationInfo::MainStage);
     m_availableApplications.append(application);
 
@@ -363,7 +364,7 @@
 
     application = new ApplicationInfo(this);
     application->setAppId("webbrowser-app");
-    application->setFullscreen(true);
+    application->setShellChrome(Mir::LowChrome);
     application->setName("Browser");
     application->setScreenshotId("browser");
     application->setIconId("browser");
@@ -389,7 +390,6 @@
     application->setName("GMail");
     application->setIconId("gmail");
     application->setScreenshotId("gmail-webapp.svg");
-    application->setFullscreen(false);
     application->setStage(ApplicationInfo::MainStage);
     application->setSupportedOrientations(Qt::PortraitOrientation
                                         | Qt::LandscapeOrientation
@@ -402,7 +402,6 @@
     application->setName("Music");
     application->setIconId("soundcloud");
     application->setScreenshotId("music");
-    application->setFullscreen(false);
     application->setStage(ApplicationInfo::MainStage);
     application->setSupportedOrientations(Qt::PortraitOrientation
                                         | Qt::LandscapeOrientation

=== modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
--- tests/mocks/Unity/Application/MirSurface.cpp	2015-11-30 18:25:47 +0000
+++ tests/mocks/Unity/Application/MirSurface.cpp	2016-02-17 14:46:08 +0000
@@ -36,6 +36,7 @@
     , m_width(-1)
     , m_height(-1)
     , m_slowToResize(false)
+    , m_shellChrome(Mir::NormalChrome)
 {
 //    qDebug() << "MirSurface::MirSurface() " << name;
     m_delayedResizeTimer.setInterval(600);
@@ -130,6 +131,21 @@
 }
 
 
+Mir::ShellChrome MirSurface::shellChrome() const
+{
+    return m_shellChrome;
+}
+
+void MirSurface::setShellChrome(Mir::ShellChrome shellChrome)
+{
+    if (shellChrome == m_shellChrome)
+        return;
+
+    m_shellChrome = shellChrome;
+    Q_EMIT shellChromeChanged(shellChrome);
+}
+
+
 
 void MirSurface::registerView(qintptr viewId)
 {

=== modified file 'tests/mocks/Unity/Application/MirSurface.h'
--- tests/mocks/Unity/Application/MirSurface.h	2015-11-30 18:25:47 +0000
+++ tests/mocks/Unity/Application/MirSurface.h	2016-02-17 14:46:08 +0000
@@ -73,10 +73,13 @@
     int widthIncrement() const override { return m_widthIncrement; }
     int heightIncrement() const override { return m_heightIncrement; }
 
+    Mir::ShellChrome shellChrome() const override;
+
     ////
     // API for tests
 
     Q_INVOKABLE void setLive(bool live);
+    Q_INVOKABLE void setShellChrome(Mir::ShellChrome shellChrome);
 
     void registerView(qintptr viewId);
     void unregisterView(qintptr viewId);
@@ -108,9 +111,6 @@
     void setActiveFocus(bool);
 
 Q_SIGNALS:
-    void stateChanged(Mir::State);
-    void liveChanged(bool live);
-    void orientationAngleChanged(Mir::OrientationAngle angle);
     void widthChanged();
     void heightChanged();
     void slowToResizeChanged();
@@ -151,6 +151,8 @@
     QSize m_delayedResize;
     QSize m_pendingResize;
 
+    Mir::ShellChrome m_shellChrome;
+
     struct View {
         bool visible;
     };

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2016-01-25 15:00:31 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2016-02-17 14:46:08 +0000
@@ -100,6 +100,15 @@
     }
 }
 
+Mir::ShellChrome MirSurfaceItem::shellChrome() const
+{
+    if (m_qmlSurface) {
+        return m_qmlSurface->shellChrome();
+    } else {
+        return Mir::NormalChrome;
+    }
+}
+
 Mir::OrientationAngle MirSurfaceItem::orientationAngle() const
 {
     if (m_qmlSurface) {

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
--- tests/mocks/Unity/Application/MirSurfaceItem.h	2016-01-25 15:00:31 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.h	2016-02-17 14:46:08 +0000
@@ -47,6 +47,7 @@
     Mir::Type type() const override;
     QString name() const override;
     bool live() const override;
+    Mir::ShellChrome shellChrome() const override;
 
     Mir::State surfaceState() const override;
     void setSurfaceState(Mir::State) override {}

=== modified file 'tests/mocks/Unity/Application/Session.cpp'
--- tests/mocks/Unity/Application/Session.cpp	2015-12-01 12:17:24 +0000
+++ tests/mocks/Unity/Application/Session.cpp	2016-02-17 14:46:08 +0000
@@ -34,6 +34,7 @@
     , m_surface(nullptr)
     , m_parentSession(nullptr)
     , m_children(new SessionModel(this))
+    , m_fullscreen(false)
 {
 //    qDebug() << "Session::Session() " << this->name();
 
@@ -71,6 +72,25 @@
     deleteLater();
 }
 
+void Session::updateFullscreenProperty()
+{
+    if (m_surfaces.rowCount() > 0) {
+        // TODO: Figure out something better
+        setFullscreen(lastSurface()->state() == Mir::FullscreenState);
+    } else {
+        // Keep the current value of the fullscreen property until we get a new
+        // surface
+    }
+}
+
+void Session::setFullscreen(bool fullscreen)
+{
+    if (m_fullscreen != fullscreen) {
+        m_fullscreen = fullscreen;
+        Q_EMIT fullscreenChanged(m_fullscreen);
+    }
+}
+
 void Session::setApplication(ApplicationInfo* application)
 {
     if (m_application == application)
@@ -82,15 +102,18 @@
 
 void Session::appendSurface(MirSurface* surface)
 {
-    // qDebug() << "Session::appendSurface - session=" << name() << "surface=" << surface;
+     qDebug() << "Session::appendSurface - session=" << name() << "surface=" << surface;
 
     m_surfaces.insert(m_surfaces.rowCount(), surface);
 
+    connect(surface, &MirSurfaceInterface::stateChanged, this, &Session::updateFullscreenProperty);
     connect(surface, &QObject::destroyed,
             this, [this, surface]() { this->removeSurface(surface); });
 
     Q_EMIT lastSurfaceChanged(surface);
     Q_EMIT surfaceAdded(surface);
+
+    updateFullscreenProperty();
 }
 
 void Session::removeSurface(MirSurface* surface)
@@ -99,6 +122,8 @@
     if (m_surfaces.contains(surface)) {
         m_surfaces.remove(surface);
     }
+
+    updateFullscreenProperty();
 }
 
 void Session::setScreenshot(const QUrl& screenshot)

=== modified file 'tests/mocks/Unity/Application/Session.h'
--- tests/mocks/Unity/Application/Session.h	2015-12-01 12:17:24 +0000
+++ tests/mocks/Unity/Application/Session.h	2016-02-17 14:46:08 +0000
@@ -47,6 +47,7 @@
     //getters
     QString name() const { return m_name; }
     bool live() const { return m_live; }
+    bool fullscreen() const { return m_fullscreen; }
     ApplicationInfo* application() const { return m_application; }
     MirSurface *lastSurface() const;
     ObjectListModel<MirSurface>* surfaces() const;
@@ -57,6 +58,7 @@
     void removeSurface(MirSurface* surface);
     void setScreenshot(const QUrl& m_screenshot);
     void setLive(bool live);
+    void setFullscreen(bool fullscreen);
 
     Q_INVOKABLE void addChildSession(Session* session);
     void insertChildSession(uint index, Session* session);
@@ -68,6 +70,7 @@
     void liveChanged(bool live);
     void surfaceAdded(MirSurface *surface);
     void lastSurfaceChanged(MirSurface *surface);
+    void fullscreenChanged(bool fullscreen);
 
     // internal mock use
     void deregister();
@@ -75,6 +78,9 @@
 public Q_SLOTS:
     Q_INVOKABLE void createSurface();
 
+private Q_SLOTS:
+    void updateFullscreenProperty();
+
 private:
     SessionModel* childSessions() const;
     void setParentSession(Session* session);
@@ -87,6 +93,7 @@
     Session* m_parentSession;
     SessionModel* m_children;
     ObjectListModel<MirSurface> m_surfaces;
+    bool m_fullscreen;
 
     friend class ApplicationTestInterface;
 };

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2016-02-12 00:11:28 +0000
+++ tests/qmltests/tst_Shell.qml	2016-02-17 14:46:08 +0000
@@ -139,6 +139,9 @@
         anchors.right: root.right
         width: units.gu(30)
 
+        property var focusedApp: ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
+        property var focusedSurface: focusedApp && focusedApp.session ? focusedApp.session.lastSurface : null
+
         Rectangle {
             id: controlRect
             anchors { left: parent.left; right: parent.right }
@@ -234,6 +237,65 @@
                         appId: modelData
                     }
                 }
+
+                Label { text: "Focused Application"; font.bold: true }
+
+                Row {
+                    CheckBox {
+                        id: fullscreeAppCheck
+
+                        onTriggered: {
+                            if (!controls.focusedSurface) return;
+                            if (controls.focusedSurface.state == Mir.FullscreenState) {
+                                controls.focusedSurface.state = Mir.RestoredState;
+                            } else {
+                                controls.focusedSurface.state = Mir.FullscreenState;
+                            }
+                        }
+
+                        Binding {
+                            target: fullscreeAppCheck
+                            when: controls.focusedSurface
+                            property: "checked"
+                            value: {
+                                if (!controls.focusedSurface) return false;
+                                controls.focusedSurface.state === Mir.FullscreenState
+                            }
+                        }
+                    }
+                    Label {
+                        text: "Fullscreen"
+                    }
+                }
+
+                Row {
+                    CheckBox {
+                        id: chromeAppCheck
+
+                        onTriggered: {
+                            if (!controls.focusedSurface) return;
+                            if (controls.focusedSurface.shellChrome == Mir.LowChrome) {
+                                controls.focusedSurface.setShellChrome(Mir.NormalChrome);
+                            } else {
+                                controls.focusedSurface.setShellChrome(Mir.LowChrome);
+                            }
+                        }
+
+                        Binding {
+                            target: chromeAppCheck
+                            when: controls.focusedSurface !== null
+                            property: "checked"
+                            value: {
+                                if (!controls.focusedSurface) return false;
+                                controls.focusedSurface.shellChrome === Mir.LowChrome
+                            }
+                        }
+                    }
+                    Label {
+                        text: "Low Chrome"
+                    }
+                }
+
             }
         }
     }