Unity 8

plugins/Utils/windowstatestorage.cpp (+62/-23)
plugins/Utils/windowstatestorage.h (+13/-1)
qml/Components/WindowControlButtons.qml (+3/-0)
qml/Panel/Panel.qml (+5/-3)
qml/Shell.qml (+2/-0)
qml/Stages/DesktopStage.qml (+10/-3)
qml/Stages/WindowResizeArea.qml (+41/-8)
tests/mocks/Utils/windowstatestorage.cpp (+17/-0)
tests/mocks/Utils/windowstatestorage.h (+12/-0)
tests/qmltests/Stages/tst_WindowResizeArea.qml (+35/-2)
tests/qmltests/tst_Shell.qml (+87/-0)

To merge this branch:

bzr merge lp:~mzanetti/unity8/panel-button-fixes

Related bugs:

Bug #1431566: Close/minimize/maximize buttons remain when switching from windowed to phone mode	High	Fix Released
Bug #1443319: when you close a maximized window,you will never see "close-minimized-maximized"button anymore	Undecided	Fix Released
Bug #1504269: Dash loses minimize & fullscreen toggle buttons in windowed mode when put into full screen	High	Fix Released
Bug #1510360: maximize, close, launch goes full screen with no buttons	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2015-10-08	Needs Fixing on 2015-11-02
Lukáš Tinkl (community)		2015-10-08	Approve on 2015-10-22
Michał Sawicz		2015-10-08	Pending
Review via email: mp+273838@code.launchpad.net

This proposal supersedes a proposal from 2015-09-28.

Commit message

Fixes for the panel buttons

* Hide panel buttons when switching to staged mode
* properly save/restore window states, not just geometry

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.

* 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?

n/a

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2015-09-25: Posted in a previous version of this proposal

It should conflict BIG TIME with mousePointer as it changes the resize area as well

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-09-25: Posted in a previous version of this proposal

ok, will redo it on top of that

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-26: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-09-28: Posted in a previous version of this proposal

> It should conflict BIG TIME with mousePointer as it changes the resize area as
> well

ok... it really wasn't that BIG TIME but it's rebased on top of that now :)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-09-28: Posted in a previous version of this proposal

There are some tests failing. Some of them fail because of the prereq branches. I'll update this when the prereqs are fixed.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-28: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-28: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-28: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-29: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2015-09-29: Posted in a previous version of this proposal

Text conflict in debian/control
Text conflict in plugins/Utils/windowstatestorage.cpp
Text conflict in qml/OrientedShell.qml
3 conflicts encountered.

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-09-29: Posted in a previous version of this proposal

> Text conflict in debian/control
> Text conflict in plugins/Utils/windowstatestorage.cpp
> Text conflict in qml/OrientedShell.qml
> 3 conflicts encountered.

They're to be resolved in the prerequisite (mousePointer)

Revision history for this message

Michał Sawicz (saviq) on 2015-09-29: Posted in a previous version of this proposal

review: Abstain

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-29: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-10-08: Posted in a previous version of this proposal

Text conflict in CMakeLists.txt
1 conflicts encountered.

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2015-10-08: Posted in a previous version of this proposal

Some inline comments

review: Needs Fixing

lp:~mzanetti/unity8/panel-button-fixes updated on 2015-10-08

1989. By Michael Zanetti on 2015-10-08: fix some review notes

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-10-08:

> Some inline comments

fixed

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2015-10-08:

Just for the record:

animationsEnabled = (animated === undefined) | animated;

this should use a logical "or", not a bitwise

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-08:

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

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/panel-button-fixes updated on 2015-10-08

1990. By Michael Zanetti on 2015-10-08: fix default arg handling

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-10-08:

> Just for the record:
>
> animationsEnabled = (animated === undefined) | animated;
>
> this should use a logical "or", not a bitwise

oops. fixed, thanks!

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-09:

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

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/panel-button-fixes updated on 2015-10-21

1991. By Michael Zanetti on 2015-10-21: merge with prereq

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-21:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2015-10-22:

The decoration buttons are now visible on the locked screen, right after start up (at which point there shall be no window open).

review: Needs Fixing

lp:~mzanetti/unity8/panel-button-fixes updated on 2015-10-22

1992. By Michael Zanetti on 2015-10-22: make sure panel buttons are not visible while greeter is shown
1993. By Michael Zanetti on 2015-10-22: drop debug print

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-22:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2015-10-22:

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

Yes, works fine

* Did CI run pass? If not, please explain why.

Nope, unity-api mismatch probably

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

Yes

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-22:

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

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/panel-button-fixes updated on 2015-10-26

1994. By Michael Zanetti on 2015-10-26: merge trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-27:

FAILED: Continuous integration, rev:1993
http://jenkins.qa.ubuntu.com/job/unity8-ci/6558/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4840
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/941/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1270
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/586/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1166
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/797/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/798/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3897
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4837
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4837/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24586
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/941/console

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

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/panel-button-fixes updated on 2015-10-27

1995. By Michael Zanetti on 2015-10-27: fix tests (clear the mock state store between tests)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-27:

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

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/panel-button-fixes updated on 2015-10-29

1996. By Michael Zanetti on 2015-10-29: fix initialisation of window storage state for new apps/windows

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-02:

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michael Zanetti

Mohammad Rakibul Hasan

Unity Team

 === modified file 'plugins/Utils/windowstatestorage.cpp'
 --- plugins/Utils/windowstatestorage.cpp	2015-09-14 09:11:08 +0000
 +++ plugins/Utils/windowstatestorage.cpp	2015-10-29 10:35:08 +0000
@@ -47,26 +47,38 @@
      m_db.close();
+ }
++void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::WindowState state)
++{
++    const QString queryString = QStringLiteral("INSERT OR REPLACE INTO state (windowId, state) values ('%1', '%2');")
++            .arg(windowId)
++            .arg((int)state);
++
++    saveValue(queryString);
++}
++
++WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const
++{
++    const QString queryString = QStringLiteral("SELECT * FROM state WHERE windowId = '%1';")
++            .arg(windowId);
++
++    QSqlQuery query = getValue(queryString);
++
++    if (!query.first()) {
++        return defaultValue;
++    }
++    return (WindowState)query.value("state").toInt();
++}
++
  void WindowStateStorage::saveGeometry(const QString &windowId, const QRect &rect)
+ {
--    QMutexLocker mutexLocker(&s_mutex);
--
--    QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")
++    const QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")
              .arg(windowId)
              .arg(rect.x())
              .arg(rect.y())
              .arg(rect.width())
              .arg(rect.height());
--    QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);
--    m_asyncQueries.append(future);
--
--    QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();
--    futureWatcher->setFuture(future);
--    connect(futureWatcher, &QFutureWatcher<void>::finished,
--            this,
--            [=](){ m_asyncQueries.removeAll(futureWatcher->future());
--                   futureWatcher->deleteLater(); });
++    saveValue(queryString);
+ }
  void WindowStateStorage::executeAsyncQuery(const QString &queryString)
@@ -82,20 +94,13 @@
+     }
+ }
--QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue)
++QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue) const
+ {
--    QMutexLocker l(&s_mutex);
      QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")
              .arg(windowId);
--    QSqlQuery query;
--
--    bool ok = query.exec(queryString);
--    if (!ok) {
--        qWarning() << "Error retrieving window state for" << windowId
--                   << "Driver error:" << query.lastError().driverText()
--                   << "Database error:" << query.lastError().databaseText();
--        return defaultValue;
--    }
++
++    QSqlQuery query = getValue(queryString);
++
      if (!query.first()) {
          return defaultValue;
+     }
@@ -114,4 +119,38 @@
          QSqlQuery query;
          query.exec(QStringLiteral("CREATE TABLE geometry(windowId TEXT UNIQUE, x INTEGER, y INTEGER, width INTEGER, height INTEGER);"));
+     }
++
++    if (!m_db.tables().contains("state")) {
++        QSqlQuery query;
++        query.exec("CREATE TABLE state(windowId TEXT UNIQUE, state INTEGER);");
++    }
++}
++
++void WindowStateStorage::saveValue(const QString &queryString)
++{
++    QMutexLocker mutexLocker(&s_mutex);
++
++    QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);
++    m_asyncQueries.append(future);
++
++    QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();
++    futureWatcher->setFuture(future);
++    connect(futureWatcher, &QFutureWatcher<void>::finished,
++            this,
++            [=](){ m_asyncQueries.removeAll(futureWatcher->future());
++        futureWatcher->deleteLater(); });
++}
++
++QSqlQuery WindowStateStorage::getValue(const QString &queryString) const
++{
++    QMutexLocker l(&s_mutex);
++    QSqlQuery query;
++
++    bool ok = query.exec(queryString);
++    if (!ok) {
++        qWarning() << "Error retrieving database query:" << queryString
++                   << "Driver error:" << query.lastError().driverText()
++                   << "Database error:" << query.lastError().databaseText();
++    }
++    return query;
+ }
 === modified file 'plugins/Utils/windowstatestorage.h'
 --- plugins/Utils/windowstatestorage.h	2015-03-13 19:01:32 +0000
 +++ plugins/Utils/windowstatestorage.h	2015-10-29 10:35:08 +0000
@@ -22,16 +22,28 @@
  class WindowStateStorage: public QObject
+ {
      Q_OBJECT
++    Q_ENUMS(WindowState)
  public:
++    enum WindowState {
++        WindowStateNormal,
++        WindowStateMaximized
++    };
++
      WindowStateStorage(QObject *parent = 0);
      virtual ~WindowStateStorage();
++    Q_INVOKABLE void saveState(const QString &windowId, WindowState state);
++    Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue) const;
++
      Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);
--    Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue);
++    Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue) const;
  private:
      void initdb();
++    void saveValue(const QString &queryString);
++    QSqlQuery getValue(const QString &queryString) const;
++
      static void executeAsyncQuery(const QString &queryString);
      static QMutex s_mutex;
 === modified file 'qml/Components/WindowControlButtons.qml'
 --- qml/Components/WindowControlButtons.qml	2014-11-24 11:21:38 +0000
 +++ qml/Components/WindowControlButtons.qml	2015-10-29 10:35:08 +0000
@@ -28,6 +28,7 @@
      signal maximize()
      Rectangle {
++        objectName: "closeWindowButton"
          height: parent.height; width: height; radius: height / 2
          gradient: Gradient {
              GradientStop { color: "#F49073"; position: 0 }
@@ -38,6 +39,7 @@
          MouseArea { anchors.fill: parent; onClicked: root.close() }
+     }
      Rectangle {
++        objectName: "minimizeWindowButton"
          height: parent.height; width: height; radius: height / 2
          gradient: Gradient {
              GradientStop { color: "#92918C"; position: 0 }
@@ -48,6 +50,7 @@
          MouseArea { anchors.fill: parent; onClicked: root.minimize() }
+     }
      Rectangle {
++        objectName: "maximizeWindowButton"
          height: parent.height; width: height; radius: height / 2
          gradient: Gradient {
              GradientStop { color: "#92918C"; position: 0 }
 === modified file 'qml/Panel/Panel.qml'
 --- qml/Panel/Panel.qml	2015-09-29 12:48:46 +0000
 +++ qml/Panel/Panel.qml	2015-10-29 10:35:08 +0000
@@ -28,6 +28,7 @@
      property alias callHint: __callHint
      property bool fullscreenMode: false
      property real indicatorAreaShowProgress: 1.0
++    property bool locked: false
      opacity: fullscreenMode && indicators.fullyClosed ? 0.0 : 1.0
@@ -136,7 +137,7 @@
+             }
              shown: false
--            width: root.width - (PanelState.buttonsVisible ? windowControlButtons.width : 0)
++            width: root.width - (windowControlButtons.visible ? windowControlButtons.width : 0)
              minimizedPanelHeight: units.gu(3)
              expandedPanelHeight: units.gu(7)
              openedHeight: root.height - indicatorOrangeLine.height
@@ -164,13 +165,14 @@
          WindowControlButtons {
              id: windowControlButtons
++            objectName: "panelWindowControlButtons"
              anchors {
                  left: parent.left
                  top: parent.top
                  margins: units.gu(0.7)
+             }
              height: indicators.minimizedPanelHeight - anchors.margins * 2
--            visible: PanelState.buttonsVisible
++            visible: PanelState.buttonsVisible && !root.locked
              onClose: PanelState.close()
              onMinimize: PanelState.minimize()
              onMaximize: PanelState.maximize()
@@ -189,7 +191,7 @@
              id: __callHint
              anchors {
                  top: parent.top
--                left: PanelState.buttonsVisible ? windowControlButtons.right : parent.left
++                left: windowControlButtons.visible ? windowControlButtons.right : parent.left
+             }
              height: indicators.minimizedPanelHeight
              visible: active && indicators.state == "initial"
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2015-10-16 17:11:54 +0000
 +++ qml/Shell.qml	2015-10-29 10:35:08 +0000
@@ -57,6 +57,7 @@
      property bool beingResized
      property string usageScenario: "phone" // supported values: "phone", "tablet" or "desktop"
      property string mode: "full-greeter"
++    property bool cursorVisible: false
      function updateFocusedAppOrientation() {
          applicationsDisplayLoader.item.updateFocusedAppOrientation();
+     }
@@ -536,6 +537,7 @@
              fullscreenMode: (topmostApplicationIsFullscreen && !lightDM.greeter.active && launcher.progress == 0)
                              || greeter.hasLockedApp
++            locked: greeter && greeter.active
+         }
          Launcher {
 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2015-10-19 14:27:57 +0000
 +++ qml/Stages/DesktopStage.qml	2015-10-29 10:35:08 +0000
@@ -111,6 +111,7 @@
          property: "buttonsVisible"
          value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.state === "maximized"
+     }
++    Component.onDestruction: PanelState.buttonsVisible = false;
      FocusScope {
          id: appContainer
@@ -140,6 +141,7 @@
                  property bool maximized: false
                  property bool minimized: false
++                property bool animationsEnabled: true
                  onFocusChanged: {
                      if (focus && ApplicationManager.focusedApplicationId !== model.appId) {
@@ -158,15 +160,18 @@
                      value: ApplicationInfoInterface.RequestedRunning // Always running for now
+                 }
--                function maximize() {
++                function maximize(animated) {
++                    animationsEnabled = (animated === undefined) || animated;
                      minimized = false;
                      maximized = true;
+                 }
--                function minimize() {
++                function minimize(animated) {
++                    animationsEnabled = (animated === undefined) || animated;
                      maximized = false;
                      minimized = true;
+                 }
--                function unmaximize() {
++                function unmaximize(animated) {
++                    animationsEnabled = (animated === undefined) || animated;
                      minimized = false;
                      maximized = false;
+                 }
@@ -188,6 +193,7 @@
                      Transition {
                          from: "maximized,minimized,normal,"
                          to: "maximized,minimized,normal,"
++                        enabled: appDelegate.animationsEnabled
                          PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
                      },
                      Transition {
@@ -213,6 +219,7 @@
+                 }
                  WindowResizeArea {
++                    objectName: "windowResizeArea"
                      target: appDelegate
                      minWidth: units.gu(10)
                      minHeight: units.gu(10)
 === modified file 'qml/Stages/WindowResizeArea.qml'
 --- qml/Stages/WindowResizeArea.qml	2015-09-29 12:48:46 +0000
 +++ qml/Stages/WindowResizeArea.qml	2015-10-29 10:35:08 +0000
@@ -36,18 +36,51 @@
      property int minWidth: 0
      property int minHeight: 0
++    QtObject {
++        id: priv
++        objectName: "priv"
++
++        property int normalX: 0
++        property int normalY: 0
++        property int normalWidth: 0
++        property int normalHeight: 0
++
++        function updateNormalGeometry() {
++            if (root.target.state == "normal") {
++                normalX = root.target.x
++                normalY = root.target.y
++                normalWidth = root.target.width
++                normalHeight = root.target.height
++            }
++        }
++    }
++
++    Connections {
++        target: root.target
++        onXChanged: priv.updateNormalGeometry();
++        onYChanged: priv.updateNormalGeometry();
++        onWidthChanged: priv.updateNormalGeometry();
++        onHeightChanged: priv.updateNormalGeometry();
++    }
++
      Component.onCompleted: {
--        var windowState = windowStateStorage.getGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
--        if (windowState !== undefined) {
--            target.x = windowState.x
--            target.y = windowState.y
--            target.width = windowState.width
--            target.height = windowState.height
--        }
++        var windowGeometry = windowStateStorage.getGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
++        if (windowGeometry !== undefined) {
++            target.x = windowGeometry.x
++            target.y = windowGeometry.y
++            target.width = windowGeometry.width
++            target.height = windowGeometry.height
++        }
++        var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)
++        if (windowState === WindowStateStorage.WindowStateMaximized) {
++            target.maximize(false)
++        }
++        priv.updateNormalGeometry();
+     }
      Component.onDestruction: {
--        windowStateStorage.saveGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
++        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))
+     }
      QtObject {
 === modified file 'tests/mocks/Utils/windowstatestorage.cpp'
 --- tests/mocks/Utils/windowstatestorage.cpp	2015-08-24 15:39:53 +0000
 +++ tests/mocks/Utils/windowstatestorage.cpp	2015-10-29 10:35:08 +0000
@@ -44,3 +44,20 @@
      if (!m_geometry.contains(windowId)) return defaultValue;
      return m_geometry.value(windowId).toRect();
+ }
++
++void WindowStateStorage::clear()
++{
++    m_state.clear();
++    m_geometry.clear();
++}
++
++void WindowStateStorage::saveState(const QString &windowId, WindowState state)
++{
++    m_state[windowId] = state;
++}
++
++WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue)
++{
++    if (!m_state.contains(windowId)) return defaultValue;
++    return m_state.value(windowId);
++}
 === modified file 'tests/mocks/Utils/windowstatestorage.h'
 --- tests/mocks/Utils/windowstatestorage.h	2015-08-24 15:39:53 +0000
 +++ tests/mocks/Utils/windowstatestorage.h	2015-10-29 10:35:08 +0000
@@ -22,12 +22,23 @@
+ {
      Q_OBJECT
      Q_PROPERTY(QVariantMap geometry READ geometry WRITE setGeometry NOTIFY geometryChanged)
++    Q_ENUMS(WindowState)
  public:
++    enum WindowState {
++        WindowStateNormal,
++        WindowStateMaximized
++    };
      WindowStateStorage(QObject *parent = 0);
++    Q_INVOKABLE void saveState(const QString &windowId, WindowState state);
++    Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue);
++
      Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);
      Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue);
++    // Only in the mock, to easily restore a fresh state
++    Q_INVOKABLE void clear();
++
  Q_SIGNALS:
      void geometryChanged(const QVariantMap& geometry);
@@ -35,5 +46,6 @@
      void setGeometry(const QVariantMap& geometry);
      QVariantMap geometry() const;
++    QHash<QString, WindowState> m_state;
      QVariantMap m_geometry;
  };
 === modified file 'tests/qmltests/Stages/tst_WindowResizeArea.qml'
 --- tests/qmltests/Stages/tst_WindowResizeArea.qml	2015-10-08 14:27:12 +0000
 +++ tests/qmltests/Stages/tst_WindowResizeArea.qml	2015-10-29 10:35:08 +0000
@@ -44,8 +44,11 @@
              width: units.gu(20)
              property int windowHeight: height
              property int windowWidth: width
--            onWindowHeightChanged: height = windowHeight
--            onWindowWidthChanged: width = windowWidth
++            state: "normal"
++
++            function maximize() {
++                state = "maximized"
++            }
              WindowResizeArea {
                  id: windowResizeArea
@@ -195,5 +198,35 @@
              tryCompare(fakeWindow, "width", initialWindowWidth);
              tryCompare(fakeWindow, "height", initialWindowHeight);
+         }
++
++        function test_saveRestoreMaximized() {
++            var initialWindowX = fakeWindow.x;
++            var initialWindowY = fakeWindow.y;
++
++            var moveDelta = units.gu(5);
++
++            fakeWindow.x = initialWindowX + moveDelta
++            fakeWindow.y = initialWindowY + moveDelta
++
++            // Now change the state to maximized. The window should not keep updating the stored values
++            fakeWindow.state = "maximized"
++            fakeWindow.x = 31415 // 0 is too risky to pass the test even when broken
++            fakeWindow.y = 31415
++
++            // This will destroy the window and recreate it
++            windowLoader.active = false;
++            waitForRendering(root);
++            windowLoader.active = true;
++
++            // Make sure it's again where we left it in normal state before destroying
++            tryCompare(fakeWindow, "x", initialWindowX + moveDelta)
++            tryCompare(fakeWindow, "y", initialWindowX + moveDelta)
++
++            // Make sure maximize() has been called after restoring
++            tryCompare(fakeWindow, "state", "maximized")
++
++            // clean up
++            fakeWindow.state = "normal"
++        }
+     }
+ }
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2015-10-20 08:10:03 +0000
 +++ tests/qmltests/tst_Shell.qml	2015-10-29 10:35:08 +0000
@@ -29,8 +29,10 @@
  import Unity.Test 0.1
  import Powerd 0.1
  import Wizard 0.1 as Wizard
++import Utils 0.1
  import "../../qml"
++import "../../qml/Components/PanelState"
  import "Stages"
  Rectangle {
@@ -302,6 +304,7 @@
              mouseEmulation.checked = true;
              tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
              tearDown();
++            WindowStateStorage.clear();
+         }
          function loadShell(formFactor) {
@@ -1707,5 +1710,89 @@
              keyRelease(Qt.Key_Control);
+         }
++
++        // regression test for http://pad.lv/1443319
++        function test_closeMaximizedAndRestart() {
++            loadDesktopShellWithApps();
++
++            var appRepeater = findChild(shell, "appRepeater")
++            var appId = ApplicationManager.get(0).appId;
++            var appDelegate = appRepeater.itemAt(0);
++            var maximizeButton = findChild(appDelegate, "maximizeWindowButton");
++
++            tryCompare(appDelegate, "state", "normal");
++            tryCompare(PanelState, "buttonsVisible", false)
++
++            mouseClick(maximizeButton, maximizeButton.width / 2, maximizeButton.height / 2);
++            tryCompare(appDelegate, "state", "maximized");
++            tryCompare(PanelState, "buttonsVisible", true)
++
++            ApplicationManager.stopApplication(appId);
++            tryCompare(PanelState, "buttonsVisible", false)
++
++            ApplicationManager.startApplication(appId);
++            tryCompare(PanelState, "buttonsVisible", true)
++        }
++
++        function test_newAppHasValidGeometry() {
++            loadDesktopShellWithApps();
++            var appRepeater = findChild(shell, "appRepeater");
++            var appId = ApplicationManager.get(0).appId;
++            var appDelegate = appRepeater.itemAt(0);
++
++            var resizeArea = findChild(appDelegate, "windowResizeArea");
++            var priv = findInvisibleChild(resizeArea, "priv");
++
++            // Make sure windows are at 0,0 or greater and they have a size that's > 0
++            compare(priv.normalX >= 0, true)
++            compare(priv.normalY >= 0, true)
++            compare(priv.normalWidth > 0, true)
++            compare(priv.normalHeight > 0, true)
++        }
++
++        // bug http://pad.lv/1431566
++        function test_switchToStagedHidesPanelButtons() {
++            loadDesktopShellWithApps();
++            var appRepeater = findChild(shell, "appRepeater")
++            var appId = ApplicationManager.get(0).appId;
++            var appDelegate = appRepeater.itemAt(0);
++            var panelButtons = findChild(shell, "panelWindowControlButtons")
++
++            tryCompare(appDelegate, "state", "normal");
++            tryCompare(panelButtons, "visible", false);
++
++            appDelegate.maximize(false);
++            tryCompare(panelButtons, "visible", true);
++
++            shell.usageScenario = "phone";
++            waitForRendering(shell);
++            tryCompare(panelButtons, "visible", false);
++
++            shell.usageScenario = "desktop";
++            waitForRendering(shell);
++            tryCompare(panelButtons, "visible", true);
++        }
++
++        function test_lockingGreeterHidesPanelButtons() {
++            loadDesktopShellWithApps();
++            var appRepeater = findChild(shell, "appRepeater")
++            var appId = ApplicationManager.get(0).appId;
++            var appDelegate = appRepeater.itemAt(0);
++            var panelButtons = findChild(shell, "panelWindowControlButtons")
++
++            tryCompare(appDelegate, "state", "normal");
++            tryCompare(panelButtons, "visible", false);
++
++            appDelegate.maximize(false);
++            tryCompare(panelButtons, "visible", true);
++
++            LightDM.Greeter.showGreeter();
++            waitForRendering(shell);
++            tryCompare(panelButtons, "visible", false);
++
++            LightDM.Greeter.hideGreeter();
++            waitForRendering(shell);
++            tryCompare(panelButtons, "visible", true);
++        }
+     }
+ }