Unity 8

Merge lp:~lukas-kde/unity8/activateWindows into lp:unity8

activateWindows
Merge into trunk

Proposed by Lukáš Tinkl on 2015-10-26

Status:	Merged
Approved by:	Albert Astals Cid on 2015-11-09
Approved revision:	2035
Merged at revision:	2046
Proposed branch:	lp:~lukas-kde/unity8/activateWindows
Merge into:	lp:unity8
Prerequisite:	lp:~mzanetti/unity8/panel-button-fixes
Diff against target:	709 lines (+317/-73) 7 files modified qml/Panel/Panel.qml (+18/-1) qml/Stages/DecoratedWindow.qml (+3/-1) qml/Stages/DesktopSpread.qml (+1/-1) qml/Stages/DesktopSpreadDelegate.qml (+2/-2) qml/Stages/DesktopStage.qml (+148/-34) qml/Stages/WindowDecoration.qml (+6/-2) tests/qmltests/Stages/tst_DesktopStage.qml (+139/-32)
To merge this branch:	bzr merge lp:~lukas-kde/unity8/activateWindows
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)			Abstain on 2015-11-09
PS Jenkins bot	continuous-integration	2015-10-26	Needs Fixing on 2015-11-07
Michael Zanetti (community)		2015-10-26	Approve on 2015-11-03
Daniel d'Andrada		2015-10-26	Pending
Review via email: mp+275706@code.launchpad.net

This proposal supersedes a proposal from 2015-10-19.

Commit Message

Restore windows when activating from the spread, maintain a focus stack

Stop displaying the "grabbing" icon when we merely click to focus the app's decoration.

Provide keyboard shortcuts for common window operations

Description of the Change

Raise/restore windows when activating from the spread, maintain a focus stack in case we minimize/close an app.

Stop displaying the "grabbing" icon when we merely click to focus the app's decoration.

Provide keyboard shortcuts for common window operations

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

https://code.launchpad.net/~mzanetti/unity8/panel-button-fixes/+merge/273838 as a prereq

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

Yes

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

N/A

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

Please follow the commit message format as explained here: https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8

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

> Please follow the commit message format as explained here:
> https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8

Should be fine now

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

Could you please add qml tests to cover those use cases you mention (ie active focus when clicking on decoration and raise/restore when activation from spread)?

I believe we already have a test for the first one (focus when clicking decoration). We had similar problems in the past before. Should investigate why it passes now even though there's a bug there (maybe it tests only with touches and not with mouse clicks, don't know).

review: Needs Fixing

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

Oh, and it's worth making lp:~unity-team/unity8/mousePointer from silo 022 a prerequisite as it makes a lot of changes in this code.

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

> > Please follow the commit message format as explained here:
> > https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8
>
> Should be fine now

Yes, thanks!

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

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

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) on 2015-10-19: Posted in a previous version of this proposal

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

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/6555/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-10-27:

are the qml failing tests a regression of this?

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

> are the qml failing tests a regression of this?

Ah yes, most likely; gonna look into them.

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/6566/rebuild

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

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

file:///home/micha/Develop/reviews/activateWindows/qml/Stages/DecoratedWindow.qml:71:16: Unable to assign [undefined] to QString
file:///home/micha/Develop/reviews/activateWindows/qml/Stages/DesktopStage.qml:218: TypeError: Cannot read property 'title' of null

Getting this warning frequently in the log. Please silence it.

review: Needs Fixing

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

> file:///home/micha/Develop/reviews/activateWindows/qml/Stages/DecoratedWindow.
> qml:71:16: Unable to assign [undefined] to QString
> file:///home/micha/Develop/reviews/activateWindows/qml/Stages/DesktopStage.qml
> :218: TypeError: Cannot read property 'title' of null
>
> Getting this warning frequently in the log. Please silence it.

Silence, and fixed (the "model.name" was even wrong), we do get the surface name already as a fallback for window.title

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

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

review: Needs Fixing (continuous-integration)

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

Here's a case where it breaks still:

* Have only one application open (dash)
* minimize it
* press alt+tab (spread will show, dash is selected)
* release alt+tab
expected: dash restores
actual: nothing happens
* now launch something else from the launcher
expected: other app launches
actual: other app launches & dash restores

review: Needs Fixing

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

* press Ctrl+Meta+Right to half-maximize the window on the right side
* press Ctrl+Meta+Down
expected: Window restores (as it does in unity7)
actual: Window minimizes

review: Needs Fixing

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

* Minimize all windows
* Press Ctrl+Meta+Up
expected: nothing happens as there is no focused window
actual: last focused app restores

review: Needs Fixing

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

* Alt+F4 doesn't seem to work for me
* Meta+Ctrl+D to Minimize all doesn't minimize maximized and semi-maximized windows (only restored ones are minimized)

Some more inline comments too.

review: Needs Fixing

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

> * Alt+F4 doesn't seem to work for me
> * Meta+Ctrl+D to Minimize all doesn't minimize maximized and semi-maximized
> windows (only restored ones are minimized)
>
> Some more inline comments too.

All issues hopefully fixed; found a new one: we should restore minimized apps to their previous state (not normal) respecting the maximized bits.

Please test again :)

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

Quite an improvement, yes! Still some small ones.

* minimize a maximized window, select it in the spread => expected: maximized, actual: restored. Same for closing a maximized one and reopening. Not sure how far we want to go with those in a single branch... this one improves things already a lot and there's still lots to do. So you decide when you want to give it a rest with this branch. We can start splitting things into multiple branches.

* managed to break alt+f4 again. I tried to log out and in again and break it again but didn't manage so far. Will keep on trying.

* During the above, I found a super weird one :D Minimize all windows, now ctrl+meta+arrow shouldn't do anything any more. Here's how: press and hold ctrl+meta and then press all 4 arrows dogether down two times in a row. It will restore a window :D Not that this would be a common thing to do, but it does indicate some focus issue when everything is minimized. Can you try to find out what's going on?

- ApplicationManager.requestFocusApplication(appId)
+ ApplicationManager.focusApplication(appId);

careful with that... can you explain the reason for this? The difference is that with "requestFocusApplication()" the shell can still execute logic like focus stealing revention (if we had that) or playing some focusing animations. If you change it to focusApplication() ApplicationManager will immediately move the item to index 0 and set it as focusedAppication. Not saying this is necessarily wrong, but just making sure you had a reason to change it.

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2015-11-01:

All issues fixed, wasn't able to reproduce the Alt+F4 problem, neither the ctrl+meta+arrows one.

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/6617/rebuild

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2015-11-02:

> All issues fixed, wasn't able to reproduce the Alt+F4 problem, neither the
> ctrl+meta+arrows one.

the ctr+meta-arrows is really easy to reproduce tho... just minimize all whindows, press and hold ctrl and alt, then use your flat hand to press down all the arrow keys, twice in a row. It will restore some windows.

Just found another one: when you semi-maximize a window (left or right), it is placed below the panel, but the panel's height is not subtracted and so the window's bottom edge is outside the screen.

review: Needs Fixing

Michael Zanetti (mzanetti) wrote on 2015-11-02:

I think I found how to reproduce the lost alt+f4: Switch to another vt (e.g. the unity7 session) and back to unity8. Alt+F4 will be gone. Could be an issue with general input handling and not directly related to the branch... Please give it a quick look if it is to be fixed in here or not.

review: Needs Information

Lukáš Tinkl (lukas-kde) wrote on 2015-11-02:

> > All issues fixed, wasn't able to reproduce the Alt+F4 problem, neither the
> > ctrl+meta+arrows one.
>
> the ctr+meta-arrows is really easy to reproduce tho... just minimize all
> whindows, press and hold ctrl and alt, then use your flat hand to press down
> all the arrow keys, twice in a row. It will restore some windows.

Can't reproduce at all :/ Nothing happens in this case

>
> Just found another one: when you semi-maximize a window (left or right), it is
> placed below the panel, but the panel's height is not subtracted and so the
> window's bottom edge is outside the screen.

Thanks for spotting, fixed

Lukáš Tinkl (lukas-kde) wrote on 2015-11-02:

For reference, the Alt+F4 bug seems to be caused by:
https://bugs.launchpad.net/bugs/1512311

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/6627/rebuild

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2015-11-03:

all issues addressed now.

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

yes

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

it did for vivid, at least qmltests. AP tests seem to have issues flashing devices.

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

yes

review: Approve

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

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-11-06:

Note: was already top approved

Text conflict in qml/Panel/Panel.qml
Text conflict in qml/Stages/DesktopStage.qml
Text conflict in tests/qmltests/Stages/tst_DesktopStage.qml
3 conflicts encountered.

review: Needs Fixing

lp:~lukas-kde/unity8/activateWindows updated on 2015-11-06

2033. By Lukáš Tinkl on 2015-11-06: merge trunk
2034. By Lukáš Tinkl on 2015-11-06: cleanup
2035. By Lukáš Tinkl on 2015-11-06: cleanup

Lukáš Tinkl (lukas-kde) wrote on 2015-11-06:

Conflicts resolved

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-11-09:

Top approving again now that merge has made CI happy.

review: Abstain

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:

Lukáš Tinkl

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Panel/Panel.qml'
 --- qml/Panel/Panel.qml	2015-11-04 14:57:33 +0000
 +++ qml/Panel/Panel.qml	2015-11-06 14:14:29 +0000
@@ -137,7 +137,7 @@
+             }
              shown: false
--            width: root.width - (windowControlButtons.visible ? windowControlButtons.width : 0)
++            width: root.width - (windowControlButtons.visible ? windowControlButtons.width + titleLabel.width : 0)
              minimizedPanelHeight: units.gu(3)
              expandedPanelHeight: units.gu(7)
              openedHeight: root.height - indicatorOrangeLine.height
@@ -178,6 +178,23 @@
              onMaximize: PanelState.maximize()
+         }
++        Label {
++            id: titleLabel
++            objectName: "windowDecorationTitle"
++            anchors {
++                left: windowControlButtons.right
++                top: parent.top
++                margins: units.gu(0.7)
++            }
++            color: "#DFDBD2"
++            height: windowControlButtons.height
++            visible: windowControlButtons.visible
++            verticalAlignment: Text.AlignVCenter
++            fontSize: "small"
++            font.bold: true
++            text: PanelState.title
++        }
++
          PanelSeparatorLine {
              id: indicatorOrangeLine
              anchors {
 === modified file 'qml/Stages/DecoratedWindow.qml'
 --- qml/Stages/DecoratedWindow.qml	2015-11-04 14:57:33 +0000
 +++ qml/Stages/DecoratedWindow.qml	2015-11-06 14:14:29 +0000
@@ -26,6 +26,7 @@
      property alias window: applicationWindow
      property alias application: applicationWindow.application
      property alias active: decoration.active
++    property alias title: decoration.title
      property bool decorationShown: true
      property bool highlightShown: false
@@ -66,7 +67,8 @@
          objectName: application ? "appWindowDecoration_" + application.appId : "appWindowDecoration_null"
          anchors { left: parent.left; top: parent.top; right: parent.right }
          height: units.gu(3)
--        title: window.title !== "" ? window.title : model.name
++        width: root.width
++        title: window.title !== "" ? window.title : ""
          onClose: root.close();
          onMaximize: root.maximize();
          onMinimize: root.minimize();
 === modified file 'qml/Stages/DesktopSpread.qml'
 --- qml/Stages/DesktopSpread.qml	2015-09-29 12:25:39 +0000
 +++ qml/Stages/DesktopSpread.qml	2015-11-06 14:14:29 +0000
@@ -87,7 +87,7 @@
      function focusSelected() {
          if (spreadRepeater.highlightedIndex != -1) {
              var application = ApplicationManager.get(spreadRepeater.highlightedIndex);
--            ApplicationManager.focusApplication(application.appId);
++            ApplicationManager.requestFocusApplication(application.appId);
+         }
+     }
 === modified file 'qml/Stages/DesktopSpreadDelegate.qml'
 --- qml/Stages/DesktopSpreadDelegate.qml	2015-09-29 12:28:10 +0000
 +++ qml/Stages/DesktopSpreadDelegate.qml	2015-11-06 14:14:29 +0000
@@ -29,8 +29,8 @@
      property bool highlightShown: false
      property real shadowOpacity: 1
--    property int windowWidth: application.session && application.session.surface ? application.session.surface.size.width : 0
--    property int windowHeight: application.session && application.session.surface ? application.session.surface.size.height : 0
++    property int windowWidth: application && application.session && application.session.surface ? application.session.surface.size.width : 0
++    property int windowHeight: application && application.session && application.session.surface ? application.session.surface.size.height : 0
      state: "normal"
      states: [
 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2015-11-04 14:58:05 +0000
 +++ qml/Stages/DesktopStage.qml	2015-11-06 14:14:29 +0000
@@ -20,11 +20,11 @@
  import QtQuick.Layouts 1.1
  import Ubuntu.Components 1.3
  import Unity.Application 0.1
--import "../Components"
  import "../Components/PanelState"
  import "../Components"
  import Utils 0.1
  import Ubuntu.Gestures 0.1
++import GlobalShortcut 1.0
  AbstractStage {
      id: root
@@ -45,21 +45,72 @@
                  spread.state = "";
+             }
--            ApplicationManager.requestFocusApplication(appId)
++            ApplicationManager.focusApplication(appId);
++        }
++
++        onApplicationRemoved: {
++            priv.focusNext();
+         }
          onFocusRequested: {
              var appIndex = priv.indexOf(appId);
              var appDelegate = appRepeater.itemAt(appIndex);
--            appDelegate.minimized = false;
--            ApplicationManager.focusApplication(appId)
++            appDelegate.restoreFromMinimized();
              if (spread.state == "altTab") {
--                spread.cancel()
++                spread.cancel();
+             }
+         }
+     }
++    GlobalShortcut {
++        id: closeWindowShortcut
++        shortcut: Qt.AltModifier|Qt.Key_F4
++        onTriggered: ApplicationManager.stopApplication(priv.focusedAppId)
++        active: priv.focusedAppId !== ""
++    }
++
++    GlobalShortcut {
++        id: showSpreadShortcut
++        shortcut: Qt.MetaModifier|Qt.Key_W
++        onTriggered: spread.state = "altTab"
++    }
++
++    GlobalShortcut {
++        id: minimizeAllShortcut
++        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_D
++        onTriggered: priv.minimizeAllWindows()
++    }
++
++    GlobalShortcut {
++        id: maximizeWindowShortcut
++        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Up
++        onTriggered: priv.focusedAppDelegate.maximize()
++        active: priv.focusedAppDelegate !== null
++    }
++
++    GlobalShortcut {
++        id: maximizeWindowLeftShortcut
++        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Left
++        onTriggered: priv.focusedAppDelegate.maximizeLeft()
++        active: priv.focusedAppDelegate !== null
++    }
++
++    GlobalShortcut {
++        id: maximizeWindowRightShortcut
++        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Right
++        onTriggered: priv.focusedAppDelegate.maximizeRight()
++        active: priv.focusedAppDelegate !== null
++    }
++
++    GlobalShortcut {
++        id: minimizeRestoreShortcut
++        shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Down
++        onTriggered: priv.focusedAppDelegate.maximized || priv.focusedAppDelegate.maximizedLeft || priv.focusedAppDelegate.maximizedRight
++                     ? priv.focusedAppDelegate.restore() : priv.focusedAppDelegate.minimize(true)
++        active: priv.focusedAppDelegate !== null
++    }
++
      QtObject {
          id: priv
@@ -93,6 +144,28 @@
+             }
              return -1;
+         }
++
++        function minimizeAllWindows() {
++            for (var i = 0; i < appRepeater.count; i++) {
++                var appDelegate = appRepeater.itemAt(i);
++                if (appDelegate && !appDelegate.minimized) {
++                    appDelegate.minimize(false); // minimize but don't switch focus
++                }
++            }
++
++            ApplicationManager.unfocusCurrentApplication(); // no app should have focus at this point
++        }
++
++        function focusNext() {
++            ApplicationManager.unfocusCurrentApplication();
++            for (var i = 0; i < appRepeater.count; i++) {
++                var appDelegate = appRepeater.itemAt(i);
++                if (appDelegate && !appDelegate.minimized) {
++                    ApplicationManager.focusApplication(appDelegate.appId);
++                    return;
++                }
++            }
++        }
+     }
      Connections {
@@ -100,15 +173,23 @@
          onClose: {
              ApplicationManager.stopApplication(ApplicationManager.focusedApplicationId)
+         }
--        onMinimize: appRepeater.itemAt(0).minimize();
--        onMaximize: appRepeater.itemAt(0).unmaximize();
++        onMinimize: appRepeater.itemAt(0).minimize(true);
++        onMaximize: appRepeater.itemAt(0).restore();
+     }
      Binding {
          target: PanelState
          property: "buttonsVisible"
--        value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.state === "maximized"
--    }
++        value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.maximized
++    }
++
++    Binding {
++        target: PanelState
++        property: "title"
++        value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.title
++        when: priv.focusedAppDelegate && priv.focusedAppDelegate.maximized
++    }
++
      Component.onDestruction: PanelState.buttonsVisible = false;
      FocusScope {
@@ -135,23 +216,26 @@
              delegate: FocusScope {
                  id: appDelegate
--                objectName: "stageDelegate_" + model.appId
++                objectName: "appDelegate_" + appId
                  z: ApplicationManager.count - index
                  y: units.gu(3)
                  width: units.gu(60)
                  height: units.gu(50)
--                focus: model.appId === priv.focusedAppId
++                focus: appId === priv.focusedAppId
                  property bool maximized: false
++                property bool maximizedLeft: false
++                property bool maximizedRight: false
                  property bool minimized: false
++                readonly property string appId: model.appId
                  property bool animationsEnabled: true
--
++                property alias title: decoratedWindow.title
                  property bool visuallyMaximized: false
                  property bool visuallyMinimized: false
                  onFocusChanged: {
--                    if (focus && ApplicationManager.focusedApplicationId !== model.appId) {
--                        ApplicationManager.focusApplication(model.appId);
++                    if (focus && ApplicationManager.focusedApplicationId !== appId) {
++                        ApplicationManager.focusApplication(appId);
+                     }
+                 }
@@ -163,8 +247,6 @@
                           (priv.foregroundMaximizedAppIdIndex === -1 || priv.foregroundMaximizedAppIdIndex >= index) ||
                           (spread.state == "altTab" && index === spread.highlightedIndex)
--                onVisibleChanged: console.log("VISIBLE", model.appId, visible)
--
                  Binding {
                      target: ApplicationManager.get(index)
                      property: "requestedState"
@@ -180,22 +262,50 @@
                      animationsEnabled = (animated === undefined) || animated;
                      minimized = false;
                      maximized = true;
++                    maximizedLeft = false;
++                    maximizedRight = false;
++                }
++                function maximizeLeft() {
++                    minimized = false;
++                    maximized = false;
++                    maximizedLeft = true;
++                    maximizedRight = false;
++                }
++                function maximizeRight() {
++                    minimized = false;
++                    maximized = false;
++                    maximizedLeft = false;
++                    maximizedRight = true;
+                 }
                  function minimize(animated) {
                      animationsEnabled = (animated === undefined) || animated;
                      maximized = false;
                      minimized = true;
+                 }
--                function unmaximize(animated) {
++                function restore(animated) {
                      animationsEnabled = (animated === undefined) || animated;
                      minimized = false;
                      maximized = false;
++                    maximizedLeft = false;
++                    maximizedRight = false;
++                }
++                function restoreFromMinimized(animated) {
++                    animationsEnabled = (animated === undefined) || animated;
++                    minimized = false;
++                    if (maximized)
++                        maximize();
++                    else if (maximizedLeft)
++                        maximizeLeft();
++                    else if (maximizedRight)
++                        maximizeRight();
++                    ApplicationManager.focusApplication(appId);
+                 }
                  states: [
                      State {
                          name: "normal";
                          when: !appDelegate.maximized && !appDelegate.minimized
++                              && !appDelegate.maximizedLeft && !appDelegate.maximizedRight
                          PropertyChanges {
                              target: appDelegate;
                              visuallyMinimized: false;
@@ -213,6 +323,14 @@
+                         }
                      },
                      State {
++                        name: "maximizedLeft"; when: appDelegate.maximizedLeft && !appDelegate.minimized
++                        PropertyChanges { target: appDelegate; x: 0; y: units.gu(3); width: root.width/2; height: root.height - units.gu(3) }
++                    },
++                    State {
++                        name: "maximizedRight"; when: appDelegate.maximizedRight && !appDelegate.minimized
++                        PropertyChanges { target: appDelegate; x: root.width/2; y: units.gu(3); width: root.width/2; height: root.height - units.gu(3) }
++                    },
++                    State {
                          name: "minimized"; when: appDelegate.minimized
                          PropertyChanges {
                              target: appDelegate;
@@ -229,14 +347,14 @@
                          to: "normal"
                          enabled: appDelegate.animationsEnabled
                          PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
--                        PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale,opacity" }
++                        PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
                      },
                      Transition {
                          to: "maximized"
                          enabled: appDelegate.animationsEnabled
                          PropertyAction { target: appDelegate; property: "visuallyMinimized" }
                          SequentialAnimation {
--                            PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale,opacity" }
++                            PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
                              PropertyAction { target: appDelegate; property: "visuallyMaximized" }
+                         }
                      },
@@ -245,20 +363,15 @@
                          enabled: appDelegate.animationsEnabled
                          PropertyAction { target: appDelegate; property: "visuallyMaximized" }
                          SequentialAnimation {
--                            PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale,opacity" }
++                            PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
                              PropertyAction { target: appDelegate; property: "visuallyMinimized" }
--                        }
--                    },
--                    Transition {
--                        from: ""
--                        to: "altTab"
--                        PropertyAction { target: appDelegate; properties: "y,angle,z,itemScale,itemScaleOriginY" }
--                        PropertyAction { target: decoratedWindow; properties: "anchors.topMargin" }
--                        PropertyAnimation {
--                            target: appDelegate; properties: "x"
--                            from: root.width
--                            duration: rightEdgePushArea.containsMouse ? UbuntuAnimation.FastDuration :0
--                            easing: UbuntuAnimation.StandardEasing
++                            ScriptAction {
++                                script: {
++                                    if (appDelegate.animationsEnabled && state === "minimized" ) {
++                                        priv.focusNext();
++                                    }
++                                }
++                            }
+                         }
+                     }
+                 ]
@@ -294,8 +407,9 @@
                      focus: true
                      onClose: ApplicationManager.stopApplication(model.appId)
--                    onMaximize: appDelegate.maximized ? appDelegate.unmaximize() : appDelegate.maximize()
--                    onMinimize: appDelegate.minimize()
++                    onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
++                                ? appDelegate.restore() : appDelegate.maximize()
++                    onMinimize: appDelegate.minimize(true)
                      onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }
+                 }
+             }
 === modified file 'qml/Stages/WindowDecoration.qml'
 --- qml/Stages/WindowDecoration.qml	2015-11-04 14:57:33 +0000
 +++ qml/Stages/WindowDecoration.qml	2015-11-06 14:14:29 +0000
@@ -45,14 +45,15 @@
              priv.distanceX = pos.x;
              priv.distanceY = pos.y;
              priv.dragging = true;
--            Mir.cursorName = "grabbing";
          } else {
              priv.dragging = false;
              Mir.cursorName = "";
+         }
+     }
++
      onPositionChanged: {
          if (priv.dragging) {
++            Mir.cursorName = "grabbing";
              var pos = mapToItem(root.target.parent, mouseX, mouseY);
              root.target.x = pos.x - priv.distanceX;
              root.target.y = pos.y - priv.distanceY;
@@ -70,11 +71,12 @@
+     }
      Row {
--        anchors { left: parent.left; top: parent.top; bottom: parent.bottom; margins: units.gu(0.7) }
++        anchors { fill: parent; margins: units.gu(0.7) }
          spacing: units.gu(1)
          opacity: root.active ? 1 : 0.5
          WindowControlButtons {
++            id: buttons
              height: parent.height
              onClose: root.close();
              onMinimize: root.minimize();
@@ -86,9 +88,11 @@
              objectName: "windowDecorationTitle"
              color: "#DFDBD2"
              height: parent.height
++            width: parent.width - buttons.width - parent.anchors.rightMargin - parent.anchors.leftMargin
              verticalAlignment: Text.AlignVCenter
              fontSize: "small"
              font.bold: true
++            elide: Text.ElideRight
+         }
+     }
+ }
 === modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
 --- tests/qmltests/Stages/tst_DesktopStage.qml	2015-11-04 14:58:05 +0000
 +++ tests/qmltests/Stages/tst_DesktopStage.qml	2015-11-06 14:14:29 +0000
@@ -60,14 +60,10 @@
          focus: true
--        property bool itemDestroyed: false
          sourceComponent: Component {
              DesktopStage {
                  color: "darkblue"
                  anchors.fill: parent
--                Component.onDestruction: {
--                    desktopStageLoader.itemDestroyed = true;
--                }
                  orientations: Orientations {}
+             }
+         }
@@ -103,16 +99,10 @@
          property Item desktopStage: desktopStageLoader.status === Loader.Ready ? desktopStageLoader.item : null
          function cleanup() {
--            desktopStageLoader.itemDestroyed = false;
              desktopStageLoader.active = false;
              tryCompare(desktopStageLoader, "status", Loader.Null);
              tryCompare(desktopStageLoader, "item", null);
--            // Loader.status might be Loader.Null and Loader.item might be null but the Loader
--            // actually took place. Likely because Loader waits until the next event loop
--            // iteration to do its work. So to ensure the reload, we will wait until the
--            // Shell instance gets destroyed.
--            tryCompare(desktopStageLoader, "itemDestroyed", true);
              killAllRunningApps();
@@ -155,10 +145,7 @@
+         }
          function test_appFocusSwitch(data) {
--            var i;
--            for (i = 0; i < data.apps.length; i++) {
--                startApplication(data.apps[i]);
--            }
++            data.apps.forEach(startApplication);
              ApplicationManager.requestFocusApplication(data.apps[data.focusfrom]);
              tryCompare(ApplicationManager.findApplication(data.apps[data.focusfrom]).session.surface, "activeFocus", true);
@@ -175,10 +162,7 @@
+         }
          function test_tappingOnWindowChangesFocusedApp(data) {
--            var i;
--            for (i = 0; i < data.apps.length; i++) {
--                startApplication(data.apps[i]);
--            }
++            data.apps.forEach(startApplication);
              var fromAppId = data.apps[data.focusfrom];
              var toAppId = data.apps[data.focusTo]
@@ -195,18 +179,37 @@
              compare(ApplicationManager.focusedApplicationId, toAppId);
+         }
++        function test_clickingOnWindowChangesFocusedApp_data() {
++            return test_tappingOnWindowChangesFocusedApp_data(); // reuse test data
++        }
++
++        function test_clickingOnWindowChangesFocusedApp(data) {
++            data.apps.forEach(startApplication);
++            var fromAppId = data.apps[data.focusfrom];
++            var toAppId = data.apps[data.focusTo]
++
++            var fromAppWindow = findChild(desktopStage, "appWindow_" + fromAppId);
++            verify(fromAppWindow);
++            mouseClick(fromAppWindow);
++            compare(fromAppWindow.application.session.surface.activeFocus, true);
++            compare(ApplicationManager.focusedApplicationId, fromAppId);
++
++            var toAppWindow = findChild(desktopStage, "appWindow_" + toAppId);
++            verify(toAppWindow);
++            mouseClick(toAppWindow);
++            compare(toAppWindow.application.session.surface.activeFocus, true);
++            compare(ApplicationManager.focusedApplicationId, toAppId);
++        }
++
          function test_tappingOnDecorationFocusesApplication_data() {
              return [
--                {tag: "dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 0, focusTo: 1 },
--                {tag: "dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 1, focusTo: 0 },
++                {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 0, focusTo: 1 },
++                {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 1, focusTo: 0 },
+             ]
+         }
          function test_tappingOnDecorationFocusesApplication(data) {
--            var i;
--            for (i = 0; i < data.apps.length; i++) {
--                startApplication(data.apps[i]);
--            }
++            data.apps.forEach(startApplication);
              var fromAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusfrom]);
              verify(fromAppDecoration);
@@ -219,10 +222,114 @@
              tryCompare(ApplicationManager.findApplication(data.apps[data.focusTo]).session.surface, "activeFocus", true);
+         }
++        function test_clickingOnDecorationFocusesApplication_data() {
++            return test_tappingOnDecorationFocusesApplication_data(); // reuse test data
++        }
++
++        function test_clickingOnDecorationFocusesApplication(data) {
++            data.apps.forEach(startApplication);
++
++            var fromAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusfrom]);
++            verify(fromAppDecoration);
++            mouseClick(fromAppDecoration);
++            tryCompare(ApplicationManager.findApplication(data.apps[data.focusfrom]).session.surface, "activeFocus", true);
++
++            var toAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusTo]);
++            verify(toAppDecoration);
++            mouseClick(toAppDecoration);
++            tryCompare(ApplicationManager.findApplication(data.apps[data.focusTo]).session.surface, "activeFocus", true);
++        }
++
++        function test_windowMaximize() {
++            var apps = ["unity8-dash", "dialer-app", "camera-app"];
++            apps.forEach(startApplication);
++            var appName = "dialer-app";
++            var appDelegate = findChild(desktopStage, "appDelegate_" + appName);
++            verify(appDelegate);
++            ApplicationManager.focusApplication(appName);
++            keyClick(Qt.Key_Up, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+Up shortcut to maximize
++            tryCompare(appDelegate, "maximized", true);
++            tryCompare(appDelegate, "minimized", false);
++        }
++
++        function test_windowMaximizeLeft() {
++            var apps = ["unity8-dash", "dialer-app", "camera-app"];
++            apps.forEach(startApplication);
++            var appName = "dialer-app";
++            var appDelegate = findChild(desktopStage, "appDelegate_" + appName);
++            verify(appDelegate);
++            ApplicationManager.focusApplication(appName);
++            keyClick(Qt.Key_Left, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+Left shortcut to maximizeLeft
++            tryCompare(appDelegate, "maximized", false);
++            tryCompare(appDelegate, "minimized", false);
++            tryCompare(appDelegate, "maximizedLeft", true);
++            tryCompare(appDelegate, "maximizedRight", false);
++        }
++
++        function test_windowMaximizeRight() {
++            var apps = ["unity8-dash", "dialer-app", "camera-app"];
++            apps.forEach(startApplication);
++            var appName = "dialer-app";
++            var appDelegate = findChild(desktopStage, "appDelegate_" + appName);
++            verify(appDelegate);
++            ApplicationManager.focusApplication(appName);
++            keyClick(Qt.Key_Right, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+Right shortcut to maximizeRight
++            tryCompare(appDelegate, "maximized", false);
++            tryCompare(appDelegate, "minimized", false);
++            tryCompare(appDelegate, "maximizedLeft", false);
++            tryCompare(appDelegate, "maximizedRight", true);
++        }
++
++        function test_windowMinimize() {
++            var apps = ["unity8-dash", "dialer-app", "camera-app"];
++            apps.forEach(startApplication);
++            var appName = "dialer-app";
++            var appDelegate = findChild(desktopStage, "appDelegate_" + appName);
++            verify(appDelegate);
++            ApplicationManager.focusApplication(appName);
++            keyClick(Qt.Key_Down, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+Down shortcut to minimize
++            tryCompare(appDelegate, "maximized", false);
++            tryCompare(appDelegate, "minimized", true);
++            verify(ApplicationManager.focusedApplicationId != ""); // verify we don't lose focus when minimizing an app
++        }
++
++        function test_windowMinimizeAll() {
++            var apps = ["unity8-dash", "dialer-app", "camera-app"];
++            apps.forEach(startApplication);
++            verify(ApplicationManager.count == 3);
++            keyClick(Qt.Key_D, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+D shortcut to minimize all
++            tryCompare(ApplicationManager, "focusedApplicationId", ""); // verify no app is focused
++        }
++
++        function test_windowClose() {
++            var apps = ["unity8-dash", "dialer-app", "camera-app"];
++            apps.forEach(startApplication);
++            verify(ApplicationManager.count == 3);
++            var appName = "dialer-app";
++            var appDelegate = findChild(desktopStage, "appDelegate_" + appName);
++            verify(appDelegate);
++            ApplicationManager.focusApplication(appName);
++            keyClick(Qt.Key_F4, Qt.AltModifier); // Alt+F4 shortcut to close
++            verify(ApplicationManager.count == 2); // verify the app is gone
++            verify(ApplicationManager.findApplication(appName) === null); // and it's not in running apps
++        }
++
++        function test_smashCursorKeys() {
++            var apps = ["unity8-dash", "dialer-app", "camera-app"];
++            apps.forEach(startApplication);
++            verify(ApplicationManager.count == 3);
++            keyClick(Qt.Key_D, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+D shortcut to minimize all
++            tryCompare(ApplicationManager, "focusedApplicationId", ""); // verify no app is focused
++
++            // now try pressing all 4 arrow keys + ctrl + meta
++            keyClick(Qt.Key_Up | Qt.Key_Down | Qt.Key_Left | Qt.Key_Right, Qt.MetaModifier|Qt.ControlModifier); // smash it!!!
++            tryCompare(ApplicationManager, "focusedApplicationId", ""); // verify still no app is focused
++        }
++
          function test_minimizeApplicationHidesSurface() {
              var dashApp = startApplication("unity8-dash");
--            var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
++            var dashDelegate = findChild(desktopStage, "appDelegate_unity8-dash");
              verify(dashDelegate);
              findChild(dashDelegate, "decoratedWindow").minimize();
@@ -234,11 +341,11 @@
              var dialerApp = startApplication("dialer-app");
              var cameraApp = startApplication("camera-app");
--            var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
++            var dashDelegate = findChild(desktopStage, "appDelegate_unity8-dash");
              verify(dashDelegate);
--            var dialerDelegate = findChild(desktopStage, "stageDelegate_dialer-app");
++            var dialerDelegate = findChild(desktopStage, "appDelegate_dialer-app");
              verify(dialerDelegate);
--            var cameraDelegate = findChild(desktopStage, "stageDelegate_camera-app");
++            var cameraDelegate = findChild(desktopStage, "appDelegate_camera-app");
              verify(cameraDelegate);
              // maximize
@@ -256,20 +363,20 @@
          function test_applicationsBecomeVisibleWhenOccludingAppRemoved() {
              var dashApp = startApplication("unity8-dash");
--            var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
++            var dashDelegate = findChild(desktopStage, "appDelegate_unity8-dash");
              verify(dashDelegate);
              var dialerApp = startApplication("dialer-app");
--            var dialerDelegate = findChild(desktopStage, "stageDelegate_dialer-app");
++            var dialerDelegate = findChild(desktopStage, "appDelegate_dialer-app");
              verify(dialerDelegate);
              var cameraApp = startApplication("camera-app");
--            var cameraDelegate = findChild(desktopStage, "stageDelegate_camera-app");
++            var cameraDelegate = findChild(desktopStage, "appDelegate_camera-app");
              verify(cameraDelegate);
              findChild(dialerDelegate, "decoratedWindow").maximize();
              var galleryApp = startApplication("gallery-app");
--            var galleryDelegate = findChild(desktopStage, "stageDelegate_gallery-app");
++            var galleryDelegate = findChild(desktopStage, "appDelegate_gallery-app");
              verify(galleryDelegate);
              findChild(galleryDelegate, "decoratedWindow").maximize();