Unity 8

Merge lp:~dandrader/unity8/childWindows into lp:unity8

childWindows
Merge into trunk

Proposed by Daniel d'Andrada on 2016-11-28

Status:

Superseded

Proposed branch:

lp:~dandrader/unity8/childWindows

Merge into:

lp:unity8

Prerequisite:

lp:~dandrader/unity8/miral

Diff against target:

1552 lines (+767/-152)

30 files modified

CMakeLists.txt (+1/-1)
plugins/WindowManager/TopLevelWindowModel.cpp (+36/-28)
plugins/WindowManager/TopLevelWindowModel.h (+2/-0)
plugins/WindowManager/Window.h (+0/-1)
qml/Components/WindowControlButtons.qml (+2/-0)
qml/Stage/ChildWindow.qml (+159/-0)
qml/Stage/ChildWindowRepeater.qml (+28/-0)
qml/Stage/ChildWindowTree.qml (+127/-0)
qml/Stage/DecoratedWindow.qml (+40/-48)
qml/Stage/MoveHandler.qml (+23/-18)
qml/Stage/Stage.qml (+49/-8)
qml/Stage/WindowControlsOverlay.qml (+21/-24)
qml/Stage/WindowDecoration.qml (+7/-2)
qml/Stage/WindowResizeArea.qml (+3/-2)
tests/mocks/Unity/Application/ApplicationInfo.cpp (+9/-1)
tests/mocks/Unity/Application/ApplicationInfo.h (+3/-0)
tests/mocks/Unity/Application/ApplicationManager.cpp (+9/-0)
tests/mocks/Unity/Application/MirSurface.cpp (+43/-0)
tests/mocks/Unity/Application/MirSurface.h (+11/-0)
tests/mocks/Unity/Application/MirSurfaceItem.cpp (+19/-4)
tests/mocks/Unity/Application/MirSurfaceListModel.h (+0/-1)
tests/mocks/Unity/Application/SurfaceManager.cpp (+15/-8)
tests/mocks/Unity/Application/SurfaceManager.h (+3/-1)
tests/mocks/Unity/Application/VirtualKeyboard.cpp (+5/-4)
tests/mocks/Unity/Application/resources/Kate.qml (+49/-0)
tests/mocks/Unity/Application/resources/KateDialog.qml (+48/-0)
tests/mocks/Unity/Application/resources/KateMenu.qml (+41/-0)
tests/mocks/Unity/Application/resources/surfaces.qrc (+3/-0)
tests/qmltests/Stage/ApplicationCheckBox.qml (+1/-1)
tests/qmltests/Stage/tst_WindowResizeArea.qml (+10/-0)

To merge this branch:

bzr merge lp:~dandrader/unity8/childWindows

Related bugs:

Bug #1543467: Unity8 can't correctly display multi-surface apps (i.e. menus and tooltips)	High	Fix Released
Bug #1591384: Dialog of Blinken app is painted all wrong the first time it is open	Undecided	Fix Released
Bug #1656727: Unity8 crashes and restarts when clicking on a menu [terminate called after throwing an instance of 'std::out_of_range' what(): map::at]	Critical	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2017-01-19
Michael Zanetti (community)			Needs Information on 2017-01-19
Gerry Boland			Needs Information on 2017-01-19
Nick Dedekind (community)		2016-11-28	Abstain on 2017-01-18
Lukáš Tinkl (community)			Needs Information on 2016-12-16
Review via email: mp+311974@code.launchpad.net

This proposal has been superseded by a proposal from 2017-01-19.

Commit Message

Initial support for child windows (menus, dialogs, tooltips)

Description of the Change

Prereq-archive: ppa:ci-train-ppa-service/2313

Good Qt apps to test with: kate, qtcreator

And keep in mind this is just the first iteration.

You can also play with it in "make tryDesktopStage" or "make tryShell" by launching the mock kate application and interacting with its UI to launch menus and dialogs.

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~dandrader/unity-api/parentSurface/+merge/313056
https://code.launchpad.net/~dandrader/qtmir/miral-surfaceLocalPos/+merge/313438

Tooltips work better with these:
https://bileto.ubuntu.com/#/ticket/2382 (miral 1.0.2)
https://code.launchpad.net/~dandrader/qtubuntu/resizeToolTip

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, although it's basically new functionality

* 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

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-28:

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/childWindows updated on 2016-11-29

2705. By Andrea Cimitan on 2016-11-29

Fix white text (LP: #1644468)

Approved by: Albert Astals Cid, Unity8 CI Bot

2706. By Andrea Cimitan on 2016-11-29

Make MascotLoader in CardCreator flat

Approved by: Albert Astals Cid, Unity8 CI Bot

2707. By Andrea Cimitan on 2016-11-29

Make the remaining UbuntuShape flat

Approved by: Albert Astals Cid, Unity8 CI Bot

2708. By Andrea Cimitan on 2016-11-29

added dropshadow from panel indicators to dash page header extra panel, so there is right shadow when the extra panel is narrow

Approved by: Albert Astals Cid, Unity8 CI Bot

2709. By Andrea Cimitan on 2016-11-29

Look up for expandable template dash category flag

Approved by: Albert Astals Cid, Unity8 CI Bot

2710. By Albert Astals Cid on 2016-11-29

Fix PreviewProgress implicitHeight

We actually want this to be the height of the progressbar that we fix so use that and not the implicitHeight (LP: #1641943)

Approved by: Andrea Cimitan, Unity8 CI Bot

2711. By Andrea Azzarone on 2016-11-29

Set Mir.cursorName to "grabbing" on first mouse press on a window decoration. Don't wait for press+motion. (LP: #1618078)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2712. By Andrea Azzarone on 2016-11-29

Do not show a divider between each quicklist entry but just between each section, similar to how unity7 does. (LP: #1637478)

Approved by: Albert Astals Cid, Unity8 CI Bot

2713. By Daniel d'Andrada on 2016-11-29

There's no need for WindowDecoration to access the appDelegate

It damages modularity.

Approved by: Michael Zanetti, Unity8 CI Bot

2714. By Brian Douglass on 2016-11-29

Added a setting to enable/disable the indicator dropdown menu.

Approved by: Michael Zanetti, Unity8 CI Bot

2715. By Michael Zanetti on 2016-11-29

disable spread interaction while locked (LP: #1641578)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2716. By Olivier Tilloy on 2016-11-29

Remove dependency on transitional package. (LP: #1583079)

Approved by: Albert Astals Cid, Unity8 CI Bot

2717. By Lukáš Tinkl on 2016-11-29

Enable brightness (laptop backlight) handling on desktop/laptop PCs (LP: #1595947)

Approved by: Michael Zanetti, Unity8 CI Bot

2718. By Andrea Azzarone on 2016-11-29

Implement launcher tooltips.

Approved by: Michał Sawicz

2719. By Albert Astals Cid on 2016-11-29

Adapt to dummy notification being gone

and warning fix as bonus

Approved by: Lukáš Tinkl, Unity8 CI Bot

2720. By Albert Astals Cid on 2016-11-29

Fix autopilot test_lock_screen tests

Approved by: Andrea Cimitan, Unity8 CI Bot

2721. By Albert Astals Cid on 2016-11-29

Autopilot: Add more applications to the list for wider screens

Otherwise the test was failing because available_applications was too short

Approved by: Andrea Cimitan, Unity8 CI Bot

2722. By Albert Astals Cid on 2016-11-29

Fix autopilot DashHelperTestCase.test_search

Approved by: Andrea Cimitan, Unity8 CI Bot

2723. By Albert Astals Cid on 2016-11-29

Also install the Screens mock

This way we can run some more autopilot tests in X11

Approved by: Lukáš Tinkl, Unity8 CI Bot

2724. By Albert Astals Cid on 2016-11-29

Give default value to gu-px size

Fixes some of the autopilot greeter tests when run under X11

Approved by: Andrea Cimitan, Unity8 CI Bot

2725. By CI Train Bot Account on 2016-11-29

Releasing 8.15+17.04.20161129-0ubuntu1

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-29:

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/childWindows updated on 2016-12-01

2726. By Launchpad Translations on behalf of unity-team on 2016-12-01: Launchpad automatic translations update.

Albert Astals Cid (aacid) wrote on 2016-12-01:

Text conflict in debian/control
Text conflict in qml/Shell.qml
Text conflict in qml/Stage/Stage.qml
Text conflict in tests/mocks/Unity/Application/plugin.cpp
Text conflict in tests/qmltests/Stage/tst_DesktopStage.qml
Text conflict in tests/qmltests/tst_Shell.qml
6 conflicts encountered.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-01:

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

review: Needs Fixing (continuous-integration)

dinamic (dinamic6661) wrote on 2016-12-01:

tested with tiled and kate (qt5 apps), brief test with tiled and kate, the child windows positioning works, if i move the parrent window, the child windows moves according to parrent's x/y. in the app switcher (alt tab) i see both the parrent and the child window. the menus open in a separate window with a wrong size and position and it usually ends up freezing unity8 when i try to close the menu or or parent. tooltips same as with menus. short video here https://vid.me/aCWQ

ubuntu 17.04 / nouveau

Daniel d'Andrada (dandrader) wrote on 2016-12-01:

On 01/12/2016 13:47, dinamic wrote:
> tested with tiled and kate (qt5 apps), brief test with tiled and kate, the child windows positioning works, if i move the parrent window, the child windows moves according to parrent's x/y. in the app switcher (alt tab) i see both the parrent and the child window. the menus open in a separate window with a wrong size and position and it usually ends up freezing unity8 when i try to close the menu or or parent. tooltips same as with menus. short video here https://vid.me/aCWQ
>
> ubuntu 17.04 / nouveau

Looks like you have an outdated qtubuntu. Menus should work fine and
child windows should not show in the app switcher.

dinamic (dinamic6661) wrote on 2016-12-01:

i have qtubuntu-desktop/zesty,now 0.63+17.04.20161123-0ubuntu1 amd64 [installed]

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-02:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-02:

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/childWindows updated on 2016-12-07

2727. By Lukáš Tinkl on 2016-12-07

Fix the Super key not invoking the dash scope home (LP: #1607427)

Approved by: Daniel d'Andrada, Unity8 CI Bot

2728. By Albert Astals Cid on 2016-12-07

Add the Wsuggest-override flag to gcc

While at it mark system includes as such so we don't get warnings we can not fix

Approved by: Michael Zanetti, Unity8 CI Bot

2729. By Albert Astals Cid on 2016-12-07

Add support for compiler sanitizers via ECM

2730. By Albert Astals Cid on 2016-12-07

Use timeStep as delay time

Passing iterations / speed didn't make much sense since that parameter is a delay in milliseconds and the default parameters would give a value of 5 / units.gu(10) that is smaller than 1 millisecond.

Qt 5.7 calculation for velocity was very unhappy if we moved things so fast in less than 1ms and ignored the movements, so this also makes tests pass on Qt 5.7 (LP: #1642919)

Approved by: Josh Arenson, Unity8 CI Bot

2731. By Michael Zanetti on 2016-12-07

Add the ApplicationDrawer

Approved by: Lukáš Tinkl, Unity8 CI Bot

2732. By Michael Zanetti on 2016-12-07

tune right edge push

make it less intrusive when accidentally hitting the edge with the mouse
tweak visuals for the mouse case (LP: #1646094)

Approved by: Unity8 CI Bot

2733. By Michael Zanetti on 2016-12-07

improve close button visiblity when hovering with the mouse

Approved by: Albert Astals Cid, Unity8 CI Bot

2734. By Albert Astals Cid on 2016-12-07

Bring back fix for 1517830

Now with autotest \o/ (LP: #1517830)

Approved by: Andrea Cimitan, Unity8 CI Bot

2735. By Daniel d'Andrada on 2016-12-07

Fix "make tryApplicationWindow"

No surface was showing up on the screen
Also remove outdated button (feature is no longer there)

Approved by: Albert Astals Cid, Unity8 CI Bot

2736. By Albert Astals Cid on 2016-12-07

Fix compile warnings in mocks

Approved by: Daniel d'Andrada, Unity8 CI Bot

2737. By Josh Arenson on 2016-12-07

Enable the greeter to remember which session the user last logged into

This also fixes a small issue with how the default session was handled. (LP: #1631365)

Approved by: Albert Astals Cid, Unity8 CI Bot

2738. By Daniel d'Andrada on 2016-12-07

Take save/restore functions out of WindowResizeArea

They've no relationship with resizing whatsoever.

Approved by: Lukáš Tinkl, Unity8 CI Bot

2739. By Michael Zanetti on 2016-12-07

Update virtual touchpad visuals and add a tutorial. (LP: #1585220)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2740. By Albert Astals Cid on 2016-12-07

Do not hide panel when launching an application if the mouse is on the panel

Need Functions.itemUnderMouse because MouseArea.containsMouse returns true when tapping (i.e. no mouse used) on it.

Unfortunately the QML testlib do not set the proper value when issueing a mouseMove so i can't add a test that proofs it works, i'll try to propose something upstream and then add the test at a later MR (LP: #1591311)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2741. By Pete Woods on 2016-12-07

MenuItemFactory: Add subtitle support to SwitchItem widget

Approved by: Marco Trevisan (Treviño), Michał Sawicz, Unity8 CI Bot

2742. By CI Train Bot Account on 2016-12-07

Releasing 8.15+17.04.20161207.1-0ubuntu1

Nick Dedekind (nick-dedekind) wrote on 2016-12-09:

Getting a conflict merging in latest unity8/miral branch.

Text conflict in plugins/WindowManager/TopLevelWindowModel.h
Text conflict in qml/Stage/WindowResizeArea.qml

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2016-12-12:

> Getting a conflict merging in latest unity8/miral branch.
>
> Text conflict in plugins/WindowManager/TopLevelWindowModel.h
> Text conflict in qml/Stage/WindowResizeArea.qml

Fixed. Rebased on top of latest unity8/miral.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-12:

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

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-12-13:

Just 2 minor nitpicks, otherwise the code looks good (haven't tested yet):

+ Window *TopLevelWindowModel::createWindow(unityapi::MirSurfaceInterface *surface)

-> const qualifier, it's a getter

+ readonly property bool decorated

-> this could be rewritten to be a direct binding, instead of a function

review: Needs Fixing

Lukáš Tinkl (lukas-kde) wrote on 2016-12-13:

Console is spammed with this warning:

TypeError: Property 'updateSurfaceRequestedPosition' of object QObject_QML_309(0x7024140) is not a function

review: Needs Fixing

lp:~dandrader/unity8/childWindows updated on 2016-12-15

2743. By Launchpad Translations on behalf of unity-team on 2016-12-15

Launchpad automatic translations update.

2744. By Daniel d'Andrada on 2016-12-15

Let the model deal with some window management decisions

eg: which window to focus, whether to change surface state

unity8 requests and reacts to changes in the model instead of applying them (LP: #1346633)

Approved by: Emanuele Antonio Faraone, Lukáš Tinkl

2745. By CI Train Bot Account on 2016-12-15

Releasing 8.15+17.04.20161215-0ubuntu1

Daniel d'Andrada (dandrader) wrote on 2016-12-16:

On 13/12/2016 09:46, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> Just 2 minor nitpicks, otherwise the code looks good (haven't tested yet):
>
> + Window *TopLevelWindowModel::createWindow(unityapi::MirSurfaceInterface *surface)
>
> -> const qualifier, it's a getter

It's not a getter and it can't be const since the generateId() method it
uses cannot be const.

> + readonly property bool decorated
>
> -> this could be rewritten to be a direct binding, instead of a function

AFAIK both notations work exactly the same. It's syntactic sugar. Made
the change anyway as it's less code.

Daniel d'Andrada (dandrader) wrote on 2016-12-16:

On 13/12/2016 11:59, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> Console is spammed with this warning:
>
> TypeError: Property 'updateSurfaceRequestedPosition' of object QObject_QML_309(0x7024140) is not a function

Fixed.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-16:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-16:

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

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-12-16:

I have a question regarding the (Kate) dialog's placement, caption and focus:

Shouldn't the dialog's titlebar be actually placed under its parent's titlebar, and focused? The font used for the dialog's caption should probably be the same as any other "focused" window; the current way it is suggests the main window in the background is still focused.

review: Needs Information

Daniel d'Andrada (dandrader) wrote on 2016-12-16:

On 16/12/2016 12:36, Lukáš Tinkl wrote:
> Review: Needs Information
>
> I have a question regarding the (Kate) dialog's placement, caption and focus:
>
> Shouldn't the dialog's titlebar be actually placed under its parent's titlebar, and focused? The font used for the dialog's caption should probably be the same as any other "focused" window; the current way it is suggests the main window in the background is still focused.

Please don't get lost in the details. This is just the first iteration.
There are loads of things to improve.

Lukáš Tinkl (lukas-kde) wrote on 2016-12-16:

> On 16/12/2016 12:36, Lukáš Tinkl wrote:
> > Review: Needs Information
> >
> > I have a question regarding the (Kate) dialog's placement, caption and
> focus:
> >
> > Shouldn't the dialog's titlebar be actually placed under its parent's
> titlebar, and focused? The font used for the dialog's caption should probably
> be the same as any other "focused" window; the current way it is suggests the
> main window in the background is still focused.
>
> Please don't get lost in the details. This is just the first iteration.
> There are loads of things to improve.

"The devil is in the detail"

I'm aware of the fact this is a first iteration but I'm sure we don't want to land stuff in a (semi) broken state

Daniel d'Andrada (dandrader) wrote on 2016-12-16:

On 16/12/2016 13:00, Lukáš Tinkl wrote:
>> On 16/12/2016 12:36, Lukáš Tinkl wrote:
>>> Review: Needs Information
>>>
>>> I have a question regarding the (Kate) dialog's placement, caption and
>> focus:
>>> Shouldn't the dialog's titlebar be actually placed under its parent's
>> titlebar, and focused? The font used for the dialog's caption should probably
>> be the same as any other "focused" window; the current way it is suggests the
>> main window in the background is still focused.
>>
>> Please don't get lost in the details. This is just the first iteration.
>> There are loads of things to improve.
> "The devil is in the detail"
>
> I'm aware of the fact this is a first iteration but I'm sure we don't want to land stuff in a (semi) broken state
>
>
As long as it's not causing regressions on existing features, it
shouldn't be a problem.

Proper positioning of child dialogs hasn't been implemented yet. Will
likely involve work on miral.

Eg: Open a child dialog. Move it to the side of its top-level parent.
Now move that top-level parent right to the edge of the display. The
child dialog will be completely offscreen.

Lukáš Tinkl (lukas-kde) wrote on 2016-12-16:

And, is this supposed to work in anything else than the desktop mode? Because in phone/tablet modes, it doesn't do anything

review: Needs Information

Daniel d'Andrada (dandrader) wrote on 2016-12-16:

On 16/12/2016 13:32, Lukáš Tinkl wrote:
> Review: Needs Information
>
> And, is this supposed to work in anything else than the desktop mode? Because in phone/tablet modes, it doesn't do anything

phone/tablet is uncharted territory with regards to child windows. Need
input from design etc.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-19:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-19:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-19:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-19:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-19:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-19:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-20:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-20:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-21:

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

review: Approve (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-12-21:

some notes from testing it:

* Menus are opening, but they close themselves again immediately again.

* Dragging around child surfaces (in my case a Toolbar in a QWidget application) will get unity8 to spin on 100% cpu in miral::Window::move_to() and not recover from that.

review: Needs Fixing

Gerry Boland (gerboland) wrote on 2016-12-21:

> some notes from testing it:
>
> * Menus are opening, but they close themselves again immediately again.
>
> * Dragging around child surfaces (in my case a Toolbar in a QWidget
> application) will get unity8 to spin on 100% cpu in miral::Window::move_to()
> and not recover from that.

I'm testing QtCreator and Kate, and not hitting either of these so far. The menu thing especially. But it does sound familiar, I think I had it at one stage, it was down to a focus issue.

Just for our info, are you using a USB mouse, or laptop trackpad, or touch?

Michael Zanetti (mzanetti) wrote on 2016-12-21:

laptop touchpad

Daniel d'Andrada (dandrader) wrote on 2016-12-22:

The problem of tooltips not redrawing is bug 1652109

Daniel d'Andrada (dandrader) wrote on 2016-12-22:

Another issue fixed elsewhere: https://code.launchpad.net/~dandrader/qtubuntu/resizeToolTip/+merge/313799

lp:~dandrader/unity8/childWindows updated on 2017-01-16

2746. By CI Train Bot Account on 2016-12-22

Resync trunk.

2747. By Launchpad Translations on behalf of unity-team on 2016-12-23

Launchpad automatic translations update.

2748. By Launchpad Translations on behalf of unity-team on 2016-12-29

Launchpad automatic translations update.

2749. By Timo Jyrinki on 2017-01-10

No change rebuild

2750. By Michael Terry on 2017-01-10

Run the qmluitests.sh autopkg test against the installed package.

This is faster and more accurate than rebuilding unity8 and running tests from the build dir.

Approved by: Albert Astals Cid, Unity8 CI Bot

2751. By Nick Dedekind on 2017-01-10

Added registry for application menus

Approved by: Michael Zanetti, Unity8 CI Bot

2752. By Michał Sawicz on 2017-01-10

Application menus

2753. By Michael Zanetti on 2017-01-10

PreviewRatingInput: Use displayText instead of text to enable/disable the Send button (LP: #1595910)

Approved by: Andrea Cimitan, Christian Dywan, Unity8 CI Bot

2754. By Michael Zanetti on 2017-01-10

Add a D-Bus interface to control some debug facilities on the fly

Approved by: Gerry Boland, Unity8 CI Bot

2755. By Michael Zanetti on 2017-01-10

some launcher workarounds for the snapping

Approved by: Albert Astals Cid, Unity8 CI Bot

2756. By dobey on 2017-01-10

Remove the payments widget and dependency on libpay as no longer needed.

Approved by: Andrea Cimitan, Unity8 CI Bot

2757. By Lukáš Tinkl on 2017-01-10

Fix touch window controls being unreachable when the overlay is being displayed (LP: #1648167)

Approved by: Josh Arenson, Unity8 CI Bot

2758. By Albert Astals Cid on 2017-01-10

Give focus to one of the buttons of the dialog

This one you can use Tab/Alt+Tab to navigate through them.

Unfortunately there's still the problem that if there's some other elements that take focus (like indicators), focus will also travel through them, but this is an start.

Approved by: Daniel d'Andrada, Unity8 CI Bot

2759. By Albert Astals Cid on 2017-01-10

tst_WindowResizeArea: Use default values for mouseFlick speed and iterations (LP: #1651580)

Approved by: Daniel d'Andrada, Unity8 CI Bot

2760. By Albert Astals Cid on 2017-01-10

Require Qt 5.6 & misc fixes

Require Qt 5.6:
We align with what we're really testing
We can use Q_ENUM/Q_FLAG instead of Q_ENUMS/Q_FLAGS (Qt 5.5)

CursorImageInfo.cpp
Join two QString::arg into one

SessionsModel.cpp
UsersModel.cpp
Remove useless Q_D

dashconnection.cpp
ColorTheme.cpp
UserMetrics.cpp
horizontaljournaltest.cpp
listviewwithpageheadersectionexternalmodeltest.cpp
organicgridtest.cpp
verticaljournaltest.cpp
QObjects should have the Q_OBJECT macro

indicatorsmodel.h
fakeindicatorsmodel.h
There's no Roles enum, remove

appdrawerproxymodel.cpp
MirSurfaceItem.cpp
Add & to the foreach variable

appdrawerproxymodel.cpp
Make the string comparison faster

easingcurve.h
Remove QEasingCurve::Type declaration, it's already in Qt

unitysortfilterproxymodelqml.h
fake_scopesoverview.h
Make some parent functions accessible to remove clang warnings

PageList.cpp
unitymenumodel.cpp
qinputdeviceinfo_mock.cpp
Better way to iterate the container

Greeter.cpp
Cheaper env var checking

mediaplayer.cpp
mediaplayer.h
Rename timerEvent, clang was not happy since QObject has another one

ApplicationInfo.h
Mark as override

MockAppDrawerModel.cpp
launchermodeltest.cpp
screens.cpp
Fix warning

fake_previewwidgetmodel.h
Forward declare struct the same way it is defined later

fake_scopes.cpp
Safer connect

horizontaljournaltest.cpp
verticaljournaltest.cpp
testutil.cpp
Use at instead of [] in temporary

launchermodelastest.cpp
Remove unused member
Use toModelIndex() instead of value<QModelIndex>()

Approved by: Michael Zanetti, Unity8 CI Bot

2761. By Lukáš Tinkl on 2017-01-10

Fixup paths for window state storage in snappy environment

Approved by: Albert Astals Cid, Unity8 CI Bot

2762. By Josh Arenson on 2017-01-10

Allow the scopes list to automatically scroll when a scope is being dragged past the bounds of the screen. (LP: #1575319)

Approved by: Andrea Cimitan, Unity8 CI Bot

2763. By Daniel van Vugt on 2017-01-10

Deprecate usage of Mir's input resampling, instead opting for:
  Shell: Raw native input events
  Apps: Qt's built-in touch compression input resampling algorithm,
         and other toolkits are expected to provide their own.

This fixes LP: #1497105 nicely, allowing apps to receive the full-speed
input stream (if they ask their toolkit to give it to them).

As an added bonus this also eliminates the 0-16.9ms (average 8.4ms) of
input lag that apps under Unity8 would experience. We do still have the
problem of output lag making everything still look laggy but I am
working to eliminate that soon in Mir 0.26.0. (LP: #1497105, #1591328)

Approved by: Gerry Boland, Unity8 CI Bot

2764. By Lukáš Tinkl on 2017-01-10

Add Unity.Platform mock for our tests (LP: #1655336)

Approved by: Michał Sawicz

2765. By Michał Sawicz on 2017-01-10

Nuke leftover Platform in IndicatorsManager

Approved by: Nick Dedekind

2766. By CI Train Bot Account on 2017-01-10

Releasing 8.15+17.04.20170110.4-0ubuntu1

2767. By CI Train Bot Account on 2017-01-15

Resync trunk.

2768. By Launchpad Translations on behalf of unity-team on 2017-01-16

Launchpad automatic translations update.

Albert Astals Cid (aacid) wrote on 2017-01-16:

Text conflict in tests/qmltests/Stage/tst_WindowResizeArea.qml
1 conflicts encountered.

Daniel d'Andrada (dandrader) wrote on 2017-01-17:

On 16/01/2017 06:46, Albert Astals Cid wrote:
> Text conflict in tests/qmltests/Stage/tst_WindowResizeArea.qml
> 1 conflicts encountered.

Fixed

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-17:

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/childWindows updated on 2017-01-18

2769. By Launchpad Translations on behalf of unity-team on 2017-01-18: Launchpad automatic translations update.

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-18:

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

review: Needs Fixing (continuous-integration)

Nick Dedekind (nick-dedekind) on 2017-01-18:

review: Abstain

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-18:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-18:

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/childWindows updated on 2017-01-19

2770. By Launchpad Translations on behalf of unity-team on 2017-01-19: Launchpad automatic translations update.

Michael Zanetti (mzanetti) wrote on 2017-01-19:

I still see some issues:

* the right click context menu shows up but closes immediately again

* the code completion popup in kate seems to not be updated properly.
this you said would be a known bug. also, normal tooltips seem to work fine, this just happens with the code completion windows (which probably aren't tooltip windows)

Gerry Boland (gerboland) wrote on 2017-01-19:

+++ qml/Stage/ChildWindowTree.qml

Just a thought:

+ readonly property bool maximized: false
+ readonly property bool maximizedLeft: false
+ readonly property bool maximizedRight: false
+ readonly property bool maximizedHorizontally: false
+ readonly property bool maximizedVertically: false
+ readonly property bool maximizedTopLeft: false
+ readonly property bool maximizedTopRight: false
+ readonly property bool maximizedBottomLeft: false
+ readonly property bool maximizedBottomRight: false

Only one of these can be set true at any time, am I right? In that case, perhaps an enum would be less wordy, and reduce chances of logic error (multiple trues)

MaximizedState.qml:

pragma Singleton
import QtQuick 2.5
QtObject {
id: singleton

    property bool maximized: 0
    property bool maximizedLeft: 1
    property bool maximizedRight: 2
...
}

and then use readonly property MaximizedState instead.

Daniel d'Andrada (dandrader) wrote on 2017-01-19:

On 19/01/2017 11:44, Gerry Boland wrote:
> +++ qml/Stage/ChildWindowTree.qml
>
> Just a thought:
>
> + readonly property bool maximized: false
> + readonly property bool maximizedLeft: false
> + readonly property bool maximizedRight: false
> + readonly property bool maximizedHorizontally: false
> + readonly property bool maximizedVertically: false
> + readonly property bool maximizedTopLeft: false
> + readonly property bool maximizedTopRight: false
> + readonly property bool maximizedBottomLeft: false
> + readonly property bool maximizedBottomRight: false
>
> Only one of these can be set true at any time, am I right? In that case, perhaps an enum would be less wordy, and reduce chances of logic error (multiple trues)
>
> MaximizedState.qml:
>
> pragma Singleton
> import QtQuick 2.5
> QtObject {
> id: singleton
>
> property bool maximized: 0
> property bool maximizedLeft: 1
> property bool maximizedRight: 2
> ...
> }
>
> and then use readonly property MaximizedState instead.

I'm just mimicking the existing API in Stage.qml, where those are used
in several places. Having all those booleans separate seem to be
convenient for use in states and expressions over there.

Gerry Boland (gerboland) wrote on 2017-01-19:

+// Meant to be created with a Loader to circunvent
typo, "circumvent"

+++ qml/Stage/ChildWindow.qml
Wanted to double-check this with you:

+ WindowDecoration {
+ onPressed: root.surface.activate();
+ onPressedChanged: if (d.moveHandler) { d.moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY); }

You're listening to both of MouseArea's pressed signals. Since the order is emission isn't guaranteed, you're sure both slots are roughly independent (one doesn't impact the other)? Just in case future Qt's reversed the order..

review: Needs Information

Gerry Boland (gerboland) wrote on 2017-01-19:

+ // Do not hold on to a dead surface so that it can be destroyed.
+ surface: root.surface && root.surface.live ? root.surface : null

Could you add a FIXME here, as I think it should not be QML's job to release the MirSurface if its backing surface goes away. Instead backing MirSurface should go away but the MirSurfaceItem can live on with the last drawn frame and properties.

Daniel d'Andrada (dandrader) wrote on 2017-01-19:

On 19/01/2017 11:58, Gerry Boland wrote:
> Review: Needs Information
>
> +// Meant to be created with a Loader to circunvent
> typo, "circumvent"

Fixed, thanks.

> +++ qml/Stage/ChildWindow.qml
> Wanted to double-check this with you:
>
> + WindowDecoration {
> + onPressed: root.surface.activate();
> + onPressedChanged: if (d.moveHandler) { d.moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY); }
>
> You're listening to both of MouseArea's pressed signals. Since the order is emission isn't guaranteed, you're sure both slots are roughly independent (one doesn't impact the other)? Just in case future Qt's reversed the order..

Again, am copy-pasting from elsewhere (DecoratedWindow.qml in this
case). I think those two are rather independent (order not particularly
important).

Gerry Boland (gerboland) wrote on 2017-01-19:

+++ qml/Stage/ChildWindowTree.qml
+ function restore(someBool, someEnum) {}
cruft?

+ var pos = mapToItem(target.parent, mouse.x, mouse.y); // How can that work if we're just a QtObject (not an Item)?
very good question. It is working yeah?

Daniel d'Andrada (dandrader) wrote on 2017-01-19:

On 19/01/2017 12:01, Gerry Boland wrote:
> + // Do not hold on to a dead surface so that it can be destroyed.
> + surface: root.surface && root.surface.live ? root.surface : null
>
> Could you add a FIXME here, as I think it should not be QML's job to release the MirSurface if its backing surface goes away. Instead backing MirSurface should go away but the MirSurfaceItem can live on with the last drawn frame and properties.

Done.

Michael Zanetti (mzanetti) wrote on 2017-01-19:

There's an issue with alt+tab:

* open an application that has only a toplevel window (e.g. terminal app)
* open an application (e.g. kate) and open a child window (e.g. the file open dialog).
* press alt+tab quickly, it will focus the terminal app
* press alt+tab again, it will focus kate's file open dialog, but not bring it to front.

=========

shouldn't this have ~dandrader/unity8/simplifyWindowDecoration as a prerequisite?

========

some inline comments

review: Needs Fixing

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-19:

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

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2017-01-19:

playing with tryShell, opening kate and then opening the menu dialogs, it would seem to me that they should close again when clicking outside of them? Currently allows going into situation where you e.g. open a couple of those menus and then when you click the menu in the title bar, the menu will appear below those in-app menus

review: Needs Information

Daniel d'Andrada (dandrader) wrote on 2017-01-19:

On 19/01/2017 12:08, Gerry Boland wrote:
> +++ qml/Stage/ChildWindowTree.qml
> + function restore(someBool, someEnum) {}
> cruft?

Removed

>
> + var pos = mapToItem(target.parent, mouse.x, mouse.y); // How can that work if we're just a QtObject (not an Item)?
> very good question. It is working yeah?

It must, otherwise resize wouldn't be working. :D
According to lukaz it gets from the context, to from the closest Item
parent...
/me shrugs
But it does deserve a refactoring at some point. This is quite messy.

Daniel d'Andrada (dandrader) wrote on 2017-01-19:

On 19/01/2017 13:31, Michael Zanetti wrote:
> Review: Needs Information
>
> playing with tryShell, opening kate and then opening the menu dialogs, it would seem to me that they should close again when clicking outside of them? Currently allows going into situation where you e.g. open a couple of those menus and then when you click the menu in the title bar, the menu will appear below those in-app menus

That fake kate has a very crude menu implementation. They are there just
so that you can check positioning and, most-importantly, its decorations
(or lack thereof).

A ChildWindow that has a dialog surface will get shadows, title bar and
be movable with touch (ie, get touch controls when appropriate). But a
ChildWindow that has a menu surface will only get shadows and nothing else.

Daniel d'Andrada (dandrader) wrote on 2017-01-19:

On 19/01/2017 11:23, Michael Zanetti wrote:
> I still see some issues:
>
> * the right click context menu shows up but closes immediately again

Still can't reproduce it. :/

> * the code completion popup in kate seems to not be updated properly.
> this you said would be a known bug. also, normal tooltips seem to work fine, this just happens with the code completion windows (which probably aren't tooltip windows)

Works fine if you install those:

https://bileto.ubuntu.com/#/ticket/2382 (miral 1.0.2)
https://code.launchpad.net/~dandrader/qtubuntu/resizeToolTip (just
updated it, btw)

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-19:

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

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2017-01-20:

On 19/01/2017 12:33, Michael Zanetti wrote:
> Review: Needs Fixing
>
> There's an issue with alt+tab:
>
> * open an application that has only a toplevel window (e.g. terminal app)
> * open an application (e.g. kate) and open a child window (e.g. the file open dialog).
> * press alt+tab quickly, it will focus the terminal app
> * press alt+tab again, it will focus kate's file open dialog, but not bring it to front.

That's miral bug 1658085

> shouldn't this have ~dandrader/unity8/simplifyWindowDecoration as a prerequisite?

Yes. Done.

> Diff comments:
>
>> === added file 'qml/Stage/ChildWindow.qml'
>> --- qml/Stage/ChildWindow.qml 1970-01-01 00:00:00 +0000
>> +++ qml/Stage/ChildWindow.qml 2017-01-18 19:24:19 +0000
>> @@ -0,0 +1,156 @@
>> [...]
>> +
>> + width: surface ? surface.size.width : 0
>> + height: surface ? surface.size.height : 0
>> +
>> + // Make it get shown and hidden with a fade in/out effect
>> + opacity: surface && surface.state !== Mir.MinimizedState && surface.state !== Mir.HiddenState ? 1.0 : 0.0
>> + Behavior on opacity { UbuntuNumberAnimation {} }
> I wonder if this might be better set to SnapDuration instead of the default of FastDuration.

I don't really have a preference. Want me to change to that?

>
>> === added file 'qml/Stage/ChildWindowTree.qml'
>> --- qml/Stage/ChildWindowTree.qml 1970-01-01 00:00:00 +0000
>> +++ qml/Stage/ChildWindowTree.qml 2017-01-18 19:24:19 +0000
>> @@ -0,0 +1,129 @@
>> +/*
>> [...]
>> + }
>> +
>> + readonly property bool windowedTransitionRunning: false
> hmm... is this used somewhere? if it's readonly and set to false, what is it good for?

As the comment above says, that's API that MoveHandler expects its
target to have.

>
>> === modified file 'qml/Stage/MoveHandler.qml'
>> --- qml/Stage/MoveHandler.qml 2016-12-12 16:45:09 +0000
>> +++ qml/Stage/MoveHandler.qml 2017-01-18 19:24:19 +0000
>> @@ -117,35 +119,38 @@
>> target.requestRestore();
>> }
>>
>> - var pos = mapToItem(target.parent, mouse.x, mouse.y);
>> + var pos = mapToItem(target.parent, mouse.x, mouse.y); // How can that work if we're just a QtObject (not an Item)?
> good question, does it?

It must, otherwise resize wouldn't be working. :D

According to lukaz it gets from the context, to from the closest Item
parent...
/me shrugs
But it does deserve a refactoring at some point. This is quite messy.

>
>> === modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
>> --- tests/mocks/Unity/Application/ApplicationInfo.cpp 2016-12-20 15:50:41 +0000
>> +++ tests/mocks/Unity/Application/ApplicationInfo.cpp 2017-01-18 19:24:19 +0000
>> @@ -122,7 +123,9 @@
>> auto surface = surfaceManager->createSurface(surfaceName,
>> Mir::NormalType,
>> fullscreen() ? Mir::FullscreenState : Mir::RestoredState,
>> - m_screenshotFileName);
>> + nullptr, /* parentSurface */
> is there a space too much?

Yes. Fixed.

lp:~dandrader/unity8/childWindows updated on 2017-01-26

2771. By Lukáš Tinkl on 2017-01-24

Fix keymap not being applied on the shell itself (LP: #1626435)

Approved by: Gerry Boland, Unity8 CI Bot

2772. By Albert Astals Cid on 2017-01-24

Limit tab-focus travelling on dialogs with a fence

Approved by: Lukáš Tinkl, Unity8 CI Bot

2773. By Lukáš Tinkl on 2017-01-24

Shell dialog improvements (kbd focus, mouse eater)

Approved by: Michael Zanetti, Unity8 CI Bot

2774. By Albert Astals Cid on 2017-01-24

Restore focus to where it was when our ShellDialogs get unloaded

UITK Dialogs want to have this feature but it seems to be broken, so i'm fixing it here first (since we use dialogs in a kind of special way)
I'll try to fix UITK next

Approved by: Andrea Cimitan, Unity8 CI Bot

2775. By Michael Terry on 2017-01-24

Simplify the lightdm mock to make future greeter improvements easier to test.

I simplified the mock liblightdm to avoid separate files for the Private classes. That can all go into the main files. The separation isn't worth wading through the files to find what you want.

And I dropped the mock LightDM plugin entirely. (opting instead for a tiny "mock()" API call on the real plugin that returns an object that can be used to manipulate our mock liblightdm, if we're in testing mode)

Approved by: Albert Astals Cid, Unity8 CI Bot

2776. By Josh Arenson on 2017-01-24

Add a test for the session chooser icon in the greeter's sessions list

Approved by: Albert Astals Cid, Unity8 CI Bot

2777. By Michael Terry on 2017-01-24

Add support for guest sessions in unity8-greeter.

Adds support for the "hasGuestAccount" and "selectGuest" LightDM hints and does so largely by having the users model report a "*guest" user, rather than adding special support in qml.

Approved by: Albert Astals Cid, Unity8 CI Bot

2778. By Michael Terry on 2017-01-24

Add support for LightDM hints for manual logins and hiding normal users.

Approved by: Albert Astals Cid, Unity8 CI Bot

2779. By Michael Terry on 2017-01-24

Use a model for PAM prompts, supporting more possible interactions.

- This lets us show more than one message and more than one prompt from PAM.

- We now also show error text when a user enters a wrong password. This matches unity7-greeter behavior.

- Similarly, when a fingerprint login is attempted, but we are demanding a real login (e.g. the user hasn't logged in before), we now show a message to explain that a bit.

- Simplify the Greeter/View interactions a bit. We no longer need to signal quite as much events, since the view reflects the prompts model directly.

- Fix keyboard focus highlight handling among prompts.

- Update and expand the tests.

Approved by: Albert Astals Cid

2780. By Albert Astals Cid on 2017-01-24

Update current session after changing the user

This matches unity7 greeter behaviour, i.e. if you change the session and then change the user, the session that shows up is the last session that new user logged in and not the new session you selected in the previous user

Approved by: Josh Arenson, Unity8 CI Bot

2781. By Albert Astals Cid on 2017-01-24

Add keyboard navigation for Indicators

Esc closes
Left/Right selects prev/next indicator

Approved by: Michael Zanetti, Unity8 CI Bot

2782. By Nick Dedekind on 2017-01-24

Added Alt+F10 shortcut to open app menus. (LP: #1656896)

Approved by: Albert Astals Cid, Unity8 CI Bot

2783. By Daniel d'Andrada on 2017-01-24

Simplify DecoratedWindow

Reduce the number of nested MouseAreas

Approved by: Nick Dedekind, Unity8 CI Bot

2784. By Nick Dedekind on 2017-01-24

Fixed menu layout width calculations. (LP: #1657050)

Approved by: Albert Astals Cid, Unity8 CI Bot

2785. By Michael Zanetti on 2017-01-24

hint the launcher to indicate a successful size change to the user (LP: #1646457)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2786. By Lukáš Tinkl on 2017-01-24

Start searching directly as you type, w/o having to first focus/click the search field.

Approved by: Michael Zanetti, Unity8 CI Bot

2787. By Michael Zanetti on 2017-01-24

Improvements for the appdrawer

Allow cancelling of the reveal gesture
move the app store uri to a gsetting (LP: #1648173)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2788. By Michael Zanetti on 2017-01-24

Adjust home key to still focus the dash instead of messing with the drawer

Approved by: Lukáš Tinkl

2789. By Albert Astals Cid on 2017-01-24

a window -> the current window

Approved by: Lukáš Tinkl

2790. By Lukáš Tinkl on 2017-01-24

Add a test for the real implementation of WindowStateStorage

Approved by: Albert Astals Cid, Unity8 CI Bot

2791. By Albert Astals Cid on 2017-01-24

There's no spreadDelegate_ anymore

Goes from ~9 to ~3 minutes

Approved by: Michael Zanetti, Unity8 CI Bot

2792. By Michael Terry on 2017-01-24

Fix grouping of autopkg output and allow optionally passing arguments to installed test scripts.

Approved by: Albert Astals Cid, Unity8 CI Bot

2793. By Lukáš Tinkl on 2017-01-24

Use a four finger gesture to open the drawer, much like in u7

Approved by: Michael Zanetti, Unity8 CI Bot

2794. By Michael Zanetti on 2017-01-24

allow 4 finger simulation with mousetouchadaptor

Approved by: Lukáš Tinkl, Unity8 CI Bot

2795. By Nick Dedekind on 2017-01-24

Skip Panel::test_drag_indicator_item_down_shows_menu

Approved by: Lukáš Tinkl, Michał Sawicz, Unity8 CI Bot

2796. By Daniel d'Andrada on 2017-01-24

Remove unnecessary warning message

It's being printed on every initialization for quite a while now and it's not prompting us
to perform any action. Thus this can't be really a warning if it's always there.

Approved by: Michael Zanetti, Unity8 CI Bot

2797. By CI Train Bot Account on 2017-01-24

Releasing 8.15+17.04.20170124-0ubuntu1

2798. By Launchpad Translations on behalf of unity-team on 2017-01-26

Launchpad automatic translations update.

2799. By Daniel d'Andrada on 2017-01-26

Initial support for child windows (menus, dialogs, tooltips)

Unmerged revisions

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:

Daniel d'Andrada

Mohammad Rakibul Hasan

Unity Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2017-01-10 14:46:09 +0000
 +++ CMakeLists.txt	2017-01-19 15:00:39 +0000
@@ -70,7 +70,7 @@
  find_package(Qt5Concurrent 5.6 REQUIRED)
  find_package(Qt5Sql 5.6 REQUIRED)
--pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)
++pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=24)
  pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
  pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
  pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
 === modified file 'plugins/WindowManager/TopLevelWindowModel.cpp'
 --- plugins/WindowManager/TopLevelWindowModel.cpp	2016-12-06 14:42:26 +0000
 +++ plugins/WindowManager/TopLevelWindowModel.cpp	2017-01-19 15:00:39 +0000
@@ -176,18 +176,13 @@
          // No point in signaling anything if we're resetting the whole model
+     }
--    int id = generateId();
--    Window *window = new Window(id, this);
--    if (surface) {
--        window->setSurface(surface);
--    }
++    Window *window = createWindow(surface);
++
      m_windowModel.prepend(ModelEntry(window, application));
      if (surface) {
          connectSurface(surface);
+     }
--    connectWindow(window);
--
      if (m_modelState == InsertingState) {
          endInsertRows();
          Q_EMIT countChanged();
@@ -322,34 +317,47 @@
+     }
+ }
++Window *TopLevelWindowModel::createWindow(unityapi::MirSurfaceInterface *surface)
++{
++    int id = generateId();
++    Window *qmlWindow = new Window(id, this);
++    connectWindow(qmlWindow);
++    if (surface) {
++        qmlWindow->setSurface(surface);
++    }
++    return qmlWindow;
++}
++
  void TopLevelWindowModel::onSurfaceCreated(unityapi::MirSurfaceInterface *surface)
+ {
      DEBUG_MSG << "(" << surface << ")";
--    if (surface->type() == Mir::InputMethodType) {
--        int id = generateId();
--        Window *qmlWindow = new Window(id, this);
--        connectWindow(qmlWindow);
--        qmlWindow->setSurface(surface);
--        setInputMethodWindow(qmlWindow);
++
++    if (surface->parentSurface()) {
++        // Wrap it in a Window so that we keep focusedWindow() up to date.
++        Window *window = createWindow(surface);
++        connect(surface, &QObject::destroyed, window, [=](){
++            window->setSurface(nullptr);
++            window->deleteLater();
++        });
      } else {
--        auto application = m_applicationManager->findApplicationWithSurface(surface);
--        if (application) {
--            prependSurface(surface, application);
++        if (surface->type() == Mir::InputMethodType) {
++            setInputMethodWindow(createWindow(surface));
          } else {
--            // Must be a prompt session. No need to do add it as a prompt surface is not top-level.
--            // It will show up in the ApplicationInfoInterface::promptSurfaceList of some application.
--            // Still wrap it in a Window though, so that we keep focusedWindow() up to date.
--            int id = generateId();
--            Window *promptWindow = new Window(id, this);
--            connectWindow(promptWindow);
--            promptWindow->setSurface(surface);
--            connect(surface, &QObject::destroyed, promptWindow, [=](){
--                promptWindow->setSurface(nullptr);
--                promptWindow->deleteLater();
--            });
++            auto *application = m_applicationManager->findApplicationWithSurface(surface);
++            if (application) {
++                prependSurface(surface, application);
++            } else {
++                // Must be a prompt session. No need to do add it as a prompt surface is not top-level.
++                // It will show up in the ApplicationInfoInterface::promptSurfaceList of some application.
++                // Still wrap it in a Window though, so that we keep focusedWindow() up to date.
++                Window *promptWindow = createWindow(surface);
++                connect(surface, &QObject::destroyed, promptWindow, [=](){
++                    promptWindow->setSurface(nullptr);
++                    promptWindow->deleteLater();
++                });
++            }
+         }
+     }
--    // TODO: handle surfaces that are neither top-level windows nor input method. eg: child dialogs, popups, menus
+ }
  void TopLevelWindowModel::removeAt(int index)
 === modified file 'plugins/WindowManager/TopLevelWindowModel.h'
 --- plugins/WindowManager/TopLevelWindowModel.h	2016-12-06 14:42:26 +0000
 +++ plugins/WindowManager/TopLevelWindowModel.h	2017-01-19 15:00:39 +0000
@@ -220,6 +220,8 @@
      void activateTopMostWindowWithoutId(int forbiddenId);
++    Window *createWindow(unity::shell::application::MirSurfaceInterface *surface);
++
      struct ModelEntry {
          ModelEntry() {}
          ModelEntry(Window *window,
 === modified file 'plugins/WindowManager/Window.h'
 --- plugins/WindowManager/Window.h	2016-11-30 19:24:02 +0000
 +++ plugins/WindowManager/Window.h	2017-01-19 15:00:39 +0000
@@ -32,7 +32,6 @@
+     }
+ }
--
  Q_DECLARE_LOGGING_CATEGORY(UNITY_WINDOW)
  /**
 === modified file 'qml/Components/WindowControlButtons.qml'
 --- qml/Components/WindowControlButtons.qml	2016-10-27 14:54:48 +0000
 +++ qml/Components/WindowControlButtons.qml	2017-01-19 15:00:39 +0000
@@ -29,6 +29,7 @@
      property bool windowIsMaximized: false
      property bool closeButtonShown: true
      property bool maximizeButtonShown: true
++    property bool minimizeButtonVisible: true
      property bool overlayShown
      signal closeClicked()
@@ -75,6 +76,7 @@
          height: parent.height
          width: height
          onClicked: root.minimizeClicked()
++        visible: root.minimizeButtonVisible
          // We dont want touch events to fall through to parent,
          // otherwise the containsMouse will not work.
 === added file 'qml/Stage/ChildWindow.qml'
 --- qml/Stage/ChildWindow.qml	1970-01-01 00:00:00 +0000
 +++ qml/Stage/ChildWindow.qml	2017-01-19 15:00:39 +0000
@@ -0,0 +1,159 @@
++/*
++ * 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 Ubuntu.Components 1.3
++import Unity.Application 0.1
++
++Item {
++    id: root
++
++    // Set from outside.
++    property var surface
++    property Item boundsItem
++    property Item target
++    property alias requestedWidth: surfaceContainer.requestedWidth
++    property alias requestedHeight: surfaceContainer.requestedHeight
++
++    width: surface ? surface.size.width : 0
++    height: surface ? surface.size.height : 0
++
++    // Make it get shown and hidden with a fade in/out effect
++    opacity: surface && surface.state !== Mir.MinimizedState && surface.state !== Mir.HiddenState ? 1.0 : 0.0
++    Behavior on opacity { UbuntuNumberAnimation {} }
++    visible: opacity !== 0.0 // make it transparent to input as well
++
++    readonly property bool dragging: windowResizeArea.dragging || d.touchOverlayDragging || d.moveHandlerDragging
++
++    QtObject {
++        id: d
++        readonly property bool decorated:  surface ? surface.type === Mir.UtilityType
++                                                       || surface.type === Mir.DialogType
++                                                       || surface.type === Mir.NormalType
++                                                   : false
++
++        readonly property bool moveable: decorated
++        readonly property bool resizeable: decorated
++
++        property alias decoration: decorationLoader.item
++        property alias moveHandler: moveHandlerLoader.item
++
++        readonly property bool touchOverlayDragging: touchOverlayLoader.item ? touchOverlayLoader.item.dragging : false
++        readonly property bool moveHandlerDragging: moveHandlerLoader.item ? moveHandlerLoader.item.dragging : false
++    }
++
++    WindowResizeArea {
++        id: windowResizeArea
++        anchors {
++            top: decorationLoader.top
++            bottom: parent.bottom
++            left: parent.left; right: parent.right
++        }
++        target: root.target
++        boundsItem: root.boundsItem
++        minWidth: units.gu(10)
++        minHeight: units.gu(10)
++        borderThickness: units.gu(2)
++        enabled: d.resizeable
++        visible: enabled
++        onPressed: root.surface.activate();
++    }
++
++    BorderImage {
++        property real shadowThickness: root.surface && root.surface.focused ? units.gu(2) : units.gu(1.5)
++        anchors {
++            top: decorationLoader.top
++            bottom: parent.bottom
++            left: parent.left; right: parent.right
++            margins: -shadowThickness
++        }
++        source: "../graphics/dropshadow2gu.sci"
++        opacity: .3
++    }
++
++    Loader {
++        id: decorationLoader
++        anchors.bottom: root.top
++        anchors.left: root.left
++        anchors.right: root.right
++
++        visible: active
++        active: d.decorated
++
++        height: item ? item.height : 0
++
++        sourceComponent: Component {
++            WindowDecoration {
++                height: units.gu(3)
++                title: root.surface ? root.surface.name : ""
++                active: root.surface ? root.surface.focused : false
++                closeButtonVisible: false
++                minimizeButtonVisible: false
++                maximizeButtonShown: false
++                onPressed: root.surface.activate();
++                onPressedChanged: if (d.moveHandler) { d.moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY); }
++                onPositionChanged: if (d.moveHandler) {
++                    d.moveHandler.handlePositionChanged(mouse);
++                }
++                onReleased: if (d.moveHandler) { d.moveHandler.handleReleased(); }
++            }
++        }
++    }
++
++    Loader {
++        id: moveHandlerLoader
++        active: d.moveable
++        sourceComponent: Component {
++            MoveHandler {
++                target: root.target
++                buttonsWidth: d.decoration ? d.decoration.buttonsWidth : 0
++                boundsItem: root.boundsItem
++                boundsTopMargin: decorationLoader.height
++            }
++        }
++    }
++
++    SurfaceContainer {
++        id: surfaceContainer
++
++        // Do not hold on to a dead surface so that it can be destroyed.
++        // FIXME It should not be QML's job to release the MirSurface if its backing surface goes away. Instead backing
++        //       MirSurface should go away but the MirSurfaceItem should be able to live on with the last drawn frame
++        //       and properties.
++        surface: root.surface && root.surface.live ? root.surface : null
++
++        requestedWidth: surface ? surface.size.width : 0
++        requestedHeight: surface ? surface.size.height : 0
++
++        // TODO ChildWindow parent will probably want to control those
++        interactive: true
++        consumesInput: true
++    }
++
++    Loader {
++        id: touchOverlayLoader
++        active: d.resizeable || d.moveable
++        anchors.top: decorationLoader.top
++        anchors.bottom: parent.bottom
++        anchors.left: parent.left
++        anchors.right: parent.right
++        sourceComponent: Component { WindowControlsOverlay {
++            target: root.target
++            resizeArea: windowResizeArea
++            boundsItem: root.boundsItem
++        } }
++    }
++}
 === added file 'qml/Stage/ChildWindowRepeater.qml'
 --- qml/Stage/ChildWindowRepeater.qml	1970-01-01 00:00:00 +0000
 +++ qml/Stage/ChildWindowRepeater.qml	2017-01-19 15:00:39 +0000
@@ -0,0 +1,28 @@
++/*
++ * 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
++
++// Meant to be created with a Loader to circumvent the "ChildWindowTree is instantiated recursively" error from the QML engine
++Repeater {
++    id: root
++    property Item boundsItem
++    delegate: ChildWindowTree {
++        surface: model.surface
++        z: root.count - model.index
++        boundsItem: root.boundsItem
++    }
++}
 === added file 'qml/Stage/ChildWindowTree.qml'
 --- qml/Stage/ChildWindowTree.qml	1970-01-01 00:00:00 +0000
 +++ qml/Stage/ChildWindowTree.qml	2017-01-19 15:00:39 +0000
@@ -0,0 +1,127 @@
++/*
++ * 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 Ubuntu.Components 1.3
++import Unity.Application 0.1
++
++Item {
++    id: root
++
++    property alias surface: childWindow.surface
++    property real displacementX: 0
++    property real displacementY: 0
++    property alias boundsItem: childWindow.boundsItem
++
++    x: surface ? surface.position.x + displacementX : 0
++    y: surface ? surface.position.y + displacementY : 0
++    width: childWindow.width
++    height: childWindow.height
++
++    ////
++    // API expected by MoveHandler (and some by WindowResizeArea as well)
++    readonly property bool maximized: false
++    readonly property bool maximizedLeft: false
++    readonly property bool maximizedRight: false
++    readonly property bool maximizedHorizontally: false
++    readonly property bool maximizedVertically: false
++    readonly property bool maximizedTopLeft: false
++    readonly property bool maximizedTopRight: false
++    readonly property bool maximizedBottomLeft: false
++    readonly property bool maximizedBottomRight: false
++    readonly property bool anyMaximized: maximized || maximizedLeft || maximizedRight || maximizedHorizontally || maximizedVertically ||
++                                         maximizedTopLeft || maximizedTopRight || maximizedBottomLeft || maximizedBottomRight
++
++    readonly property bool canBeCornerMaximized: false
++    readonly property bool canBeMaximizedLeftRight: false
++    readonly property bool canBeMaximized: false
++
++    readonly property var resizeArea: QtObject {
++        property real normalWidth: units.gu(1)
++        property real normalHeight: units.gu(1)
++    }
++
++    readonly property bool windowedTransitionRunning: false
++
++    // NB: those bindings will be overwritten by MoveHandler when you first move the window
++    property real windowedX: x
++    property real windowedY: y
++
++
++    property real restoredX
++    property real restoredY
++
++    state: "restored"
++    // end of API expected by MoveHandler
++    ////
++
++    ////
++    // API expected by WindowResizeArea
++    property real windowedWidth: childWindow.width
++    property real windowedHeight: childWindow.height
++    // end of API expected by WindowResizeArea
++    ////
++
++    ////
++    // API expected by WindowControlsOverlay
++    function activate() {
++        surface.activate();
++    }
++    // end of API expected by WindowControlsOverlay
++    ////
++
++    Binding {
++        target: root.surface
++        when: childWindow.dragging
++        property: "requestedPosition"
++        value: Qt.point(root.windowedX - root.displacementX,
++                        root.windowedY - root.displacementY);
++    }
++
++    // It's a separate Item so that a window can be hid independently of its children
++    ChildWindow {
++        id: childWindow
++        target: root
++        requestedWidth: root.windowedWidth
++        requestedHeight: root.windowedHeight
++    }
++
++    Connections {
++        target: root.surface
++        onFocusRequested: {
++            root.surface.activate();
++        }
++    }
++
++    // Using a loader here mainly to circunvent the "ChildWindowTree is instantiated recursively" error from the QML engine
++    Loader {
++        id: childRepeaterLoader
++        source: "ChildWindowRepeater.qml"
++        active: root.surface && root.surface.childSurfaceList.count > 0
++        Binding {
++            target: childRepeaterLoader.item
++            when: childRepeaterLoader.item
++            property: "model"
++            value: root.surface ? root.surface.childSurfaceList : null
++        }
++        Binding {
++            target: childRepeaterLoader.item
++            when: childRepeaterLoader.item
++            property: "boundsItem"
++            value: root.boundsItem
++        }
++    }
++}
 === modified file 'qml/Stage/DecoratedWindow.qml'
 --- qml/Stage/DecoratedWindow.qml	2016-12-12 11:16:47 +0000
 +++ qml/Stage/DecoratedWindow.qml	2017-01-19 15:00:39 +0000
@@ -67,8 +67,7 @@
      readonly property int heightIncrement: !counterRotate ? applicationWindow.heightIncrement : applicationWindow.widthIncrement
      property alias overlayShown: decoration.overlayShown
--    property alias stageWidth: moveHandler.stageWidth
--    property alias stageHeight: moveHandler.stageHeight
++    property alias boundsItem: moveHandler.boundsItem
      readonly property alias dragging: moveHandler.dragging
      readonly property Item clientAreaItem: applicationWindow
@@ -196,18 +195,19 @@
+         ]
+     }
--    MouseArea {
++    WindowDecoration {
++        id: decoration
++        closeButtonVisible: root.application.appId !== "unity8-dash"
++        objectName: "appWindowDecoration"
++
          anchors { left: parent.left; top: parent.top; right: parent.right }
          height: units.gu(3)
++        title: applicationWindow.title
++
          opacity: root.hasDecoration ? Math.min(1, root.showDecoration) : 0
--
          Behavior on opacity { UbuntuNumberAnimation { } }
--        drag.target: Item {}
--        drag.filterChildren: true
--        drag.threshold: 0
--
          onPressed: root.decorationPressed();
          onPressedChanged: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)
          onPositionChanged: moveHandler.handlePositionChanged(mouse)
@@ -216,47 +216,39 @@
              moveHandler.handleReleased();
+         }
--        WindowDecoration {
--            id: decoration
--            closeButtonVisible: root.application.appId !== "unity8-dash"
--            objectName: "appWindowDecoration"
--            anchors.fill: parent
--            title: applicationWindow.title
--
--            onCloseClicked: root.closeClicked();
--            onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
--            onMaximizeHorizontallyClicked: { root.decorationPressed(); root.maximizeHorizontallyClicked(); }
--            onMaximizeVerticallyClicked: { root.decorationPressed(); root.maximizeVerticallyClicked(); }
--            onMinimizeClicked: root.minimizeClicked();
--
--            enableMenus: {
--                return active &&
--                         surface &&
--                          (PanelState.focusedPersistentSurfaceId === surface.persistentId && !PanelState.decorationsVisible)
--            }
--            menu: sharedAppModel.model
--
--            Indicators.SharedUnityMenuModel {
--                id: sharedAppModel
--                property var menus: surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : []
--                property var menuService: menus.length > 0 ? menus[0] : undefined
--
--                busName: menuService ? menuService.service : ""
--                menuObjectPath: menuService && menuService.menuPath ? menuService.menuPath : ""
--                actions: menuService && menuService.actionPath ? { "unity": menuService.actionPath } : {}
--            }
--
--            Connections {
--                target: ApplicationMenuRegistry
--                onSurfaceMenuRegistered: {
--                    if (surface && surfaceId === surface.persistentId) {
--                        sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
--                    }
++        onCloseClicked: root.closeClicked();
++        onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
++        onMaximizeHorizontallyClicked: { root.decorationPressed(); root.maximizeHorizontallyClicked(); }
++        onMaximizeVerticallyClicked: { root.decorationPressed(); root.maximizeVerticallyClicked(); }
++        onMinimizeClicked: root.minimizeClicked();
++
++        enableMenus: {
++            return active &&
++                     surface &&
++                      (PanelState.focusedPersistentSurfaceId === surface.persistentId && !PanelState.decorationsVisible)
++        }
++        menu: sharedAppModel.model
++
++        Indicators.SharedUnityMenuModel {
++            id: sharedAppModel
++            property var menus: surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : []
++            property var menuService: menus.length > 0 ? menus[0] : undefined
++
++            busName: menuService ? menuService.service : ""
++            menuObjectPath: menuService && menuService.menuPath ? menuService.menuPath : ""
++            actions: menuService && menuService.actionPath ? { "unity": menuService.actionPath } : {}
++        }
++
++        Connections {
++            target: ApplicationMenuRegistry
++            onSurfaceMenuRegistered: {
++                if (surface && surfaceId === surface.persistentId) {
++                    sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
+                 }
--                onSurfaceMenuUnregistered: {
--                    if (surface && surfaceId === surface.persistentId) {
--                        sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
--                    }
++            }
++            onSurfaceMenuUnregistered: {
++                if (surface && surfaceId === surface.persistentId) {
++                    sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
+                 }
+             }
+         }
 === modified file 'qml/Stage/MoveHandler.qml'
 --- qml/Stage/MoveHandler.qml	2016-12-12 16:45:09 +0000
 +++ qml/Stage/MoveHandler.qml	2017-01-19 15:00:39 +0000
@@ -19,15 +19,14 @@
  import Ubuntu.Components 1.3
  import Utils 0.1
  import "../Components"
--import "../Components/PanelState"
  QtObject {
      id: root
      property Item target // appDelegate
--    property int stageWidth
--    property int stageHeight
      property real buttonsWidth: 0
++    property Item boundsItem
++    property real boundsTopMargin: 0
      readonly property bool dragging: priv.dragging
@@ -79,7 +78,10 @@
              // length of the triggerArea square diagonal
              var diagLength = Math.sqrt(2 * priv.triggerArea * priv.triggerArea);
              var ratio = 1 - (distance / diagLength);
--            return bx > 0 && bx <= stageWidth && by > 0 && by <= stageHeight ? ratio : 1; // everything "outside" of our square from the center is 1
++
++            // everything "outside" of our square from the center is 1
++            var mousePosBoundsCoords = target.mapToItem(root.boundsItem, bx, by);
++            return root.boundsItem.contains(mousePosBoundsCoords) ? ratio : 1;
+         }
          property real progress: 0
+     }
@@ -117,35 +119,38 @@
                  target.requestRestore();
+             }
--            var pos = mapToItem(target.parent, mouse.x, mouse.y);
++            var pos = mapToItem(target.parent, mouse.x, mouse.y); // How can that work if we're just a QtObject (not an Item)?
++            var bounds = boundsItem.mapToItem(target.parent, 0, 0, boundsItem.width, boundsItem.height);
++            bounds.y += boundsTopMargin;
++            bounds.height -= boundsTopMargin;
              // Use integer coordinate values to ensure that target is left in a pixel-aligned
              // position. Mouse movement could have subpixel precision, yielding a fractional
              // mouse position.
              target.windowedX = Math.round(pos.x - priv.distanceX);
--            target.windowedY = Math.round(Math.max(pos.y - priv.distanceY, PanelState.panelHeight));
++            target.windowedY = Math.round(Math.max(pos.y - priv.distanceY, bounds.top));
              if (sensingPoints) { // edge/corner detection when dragging via the touch overlay
--                if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < PanelState.panelHeight + priv.triggerArea
++                if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < bounds.top + priv.triggerArea
                          && target.canBeCornerMaximized) { // top left
--                    priv.progress = priv.progressInCorner(0, PanelState.panelHeight, sensingPoints.topLeft.x, sensingPoints.topLeft.y);
++                    priv.progress = priv.progressInCorner(bounds.left, bounds.top, sensingPoints.topLeft.x, sensingPoints.topLeft.y);
                      priv.resetEdges();
                      priv.nearTopLeftCorner = true;
                      root.fakeMaximizeTopLeftAnimationRequested(priv.progress);
--                } else if (sensingPoints.topRight.x > stageWidth - priv.triggerArea && sensingPoints.topRight.y < PanelState.panelHeight + priv.triggerArea
++                } else if (sensingPoints.topRight.x > bounds.right - priv.triggerArea && sensingPoints.topRight.y < bounds.top + priv.triggerArea
                             && target.canBeCornerMaximized) { // top right
--                    priv.progress = priv.progressInCorner(stageWidth, PanelState.panelHeight, sensingPoints.topRight.x, sensingPoints.topRight.y);
++                    priv.progress = priv.progressInCorner(bounds.right, bounds.top, sensingPoints.topRight.x, sensingPoints.topRight.y);
                      priv.resetEdges();
                      priv.nearTopRightCorner = true;
                      root.fakeMaximizeTopRightAnimationRequested(priv.progress);
--                } else if (sensingPoints.bottomLeft.x < priv.triggerArea && sensingPoints.bottomLeft.y > stageHeight - priv.triggerArea
++                } else if (sensingPoints.bottomLeft.x < priv.triggerArea && sensingPoints.bottomLeft.y > bounds.bottom - priv.triggerArea
                             && target.canBeCornerMaximized) { // bottom left
--                    priv.progress = priv.progressInCorner(0, stageHeight, sensingPoints.bottomLeft.x, sensingPoints.bottomLeft.y);
++                    priv.progress = priv.progressInCorner(bounds.left, bounds.bottom, sensingPoints.bottomLeft.x, sensingPoints.bottomLeft.y);
                      priv.resetEdges();
                      priv.nearBottomLeftCorner = true;
                      root.fakeMaximizeBottomLeftAnimationRequested(priv.progress);
--                } else if (sensingPoints.bottomRight.x > stageWidth - priv.triggerArea && sensingPoints.bottomRight.y > stageHeight - priv.triggerArea
++                } else if (sensingPoints.bottomRight.x > bounds.right - priv.triggerArea && sensingPoints.bottomRight.y > bounds.bottom - priv.triggerArea
                             && target.canBeCornerMaximized) { // bottom right
--                    priv.progress = priv.progressInCorner(stageWidth, stageHeight, sensingPoints.bottomRight.x, sensingPoints.bottomRight.y);
++                    priv.progress = priv.progressInCorner(bounds.right, bounds.bottom, sensingPoints.bottomRight.x, sensingPoints.bottomRight.y);
                      priv.resetEdges();
                      priv.nearBottomRightCorner = true;
                      root.fakeMaximizeBottomRightAnimationRequested(priv.progress);
@@ -154,13 +159,13 @@
                      priv.resetEdges();
                      priv.nearLeftEdge = true;
                      root.fakeMaximizeLeftAnimationRequested(priv.progress);
--                } else if (sensingPoints.right.x > stageWidth - priv.triggerArea && target.canBeMaximizedLeftRight) { // right
--                    priv.progress = MathUtils.clampAndProject(sensingPoints.right.x, stageWidth - priv.triggerArea, stageWidth, 0, 1);
++                } else if (sensingPoints.right.x > bounds.right - priv.triggerArea && target.canBeMaximizedLeftRight) { // right
++                    priv.progress = MathUtils.clampAndProject(sensingPoints.right.x, bounds.right - priv.triggerArea, bounds.right, 0, 1);
                      priv.resetEdges();
                      priv.nearRightEdge = true;
                      root.fakeMaximizeRightAnimationRequested(priv.progress);
--                } else if (sensingPoints.top.y < PanelState.panelHeight + priv.triggerArea && target.canBeMaximized) { // top
--                    priv.progress = MathUtils.clampAndProject(sensingPoints.top.y, PanelState.panelHeight + priv.triggerArea, 0, 0, 1);
++                } else if (sensingPoints.top.y < bounds.top + priv.triggerArea && target.canBeMaximized) { // top
++                    priv.progress = MathUtils.clampAndProject(sensingPoints.top.y, bounds.top + priv.triggerArea, 0, 0, 1);
                      priv.resetEdges();
                      priv.nearTopEdge = true;
                      root.fakeMaximizeAnimationRequested(priv.progress);
 === modified file 'qml/Stage/Stage.qml'
 --- qml/Stage/Stage.qml	2017-01-03 12:04:08 +0000
 +++ qml/Stage/Stage.qml	2017-01-19 15:00:39 +0000
@@ -665,6 +665,13 @@
+             }
+         }
++        Item {
++            id: boundariesForWindowPlacement
++            anchors.fill: parent
++            anchors.topMargin: PanelState.panelHeight
++            visible: false
++        }
++
          Repeater {
              id: appRepeater
              model: topLevelSurfaceList
@@ -833,7 +840,6 @@
                  readonly property var surface: model.window.surface
                  readonly property var window: model.window
--                readonly property alias resizeArea: resizeArea
                  readonly property alias focusedSurface: decoratedWindow.focusedSurface
                  readonly property bool dragging: touchControls.overlayShown ? touchControls.dragging : decoratedWindow.dragging
@@ -890,7 +896,7 @@
                      screenWidth: appContainer.width
                      screenHeight: appContainer.height
                      leftMargin: root.leftMargin
--                    minimumY: PanelState.panelHeight
++                    minimumY: boundariesForWindowPlacement.y
+                 }
                  Connections {
@@ -1520,7 +1526,7 @@
                      anchors.margins: touchControls.overlayShown ? borderThickness/2 : -borderThickness
                      target: appDelegate
--                    minimumY: PanelState.panelHeight // disallow resizing up past Panel
++                    boundsItem: boundariesForWindowPlacement
                      minWidth: units.gu(10)
                      minHeight: units.gu(10)
                      borderThickness: units.gu(2)
@@ -1539,7 +1545,7 @@
                      anchors.top: appDelegate.top
                      application: model.application
                      surface: model.window.surface
--                    active: appDelegate.focus
++                    active: model.window.focused
                      focus: true
                      interactive: root.interactive
                      showDecoration: 1
@@ -1548,8 +1554,7 @@
                      width: implicitWidth
                      height: implicitHeight
                      highlightSize: windowInfoItem.iconMargin / 2
--                    stageWidth: appContainer.width
--                    stageHeight: appContainer.height
++                    boundsItem: boundariesForWindowPlacement
                      requestedWidth: appDelegate.requestedWidth
                      requestedHeight: appDelegate.requestedHeight
@@ -1604,11 +1609,12 @@
                  WindowControlsOverlay {
                      id: touchControls
++                    anchors.fill: appDelegate
                      target: appDelegate
++                    resizeArea: resizeArea
                      enabled: false
                      visible: enabled
--                    stageWidth: appContainer.width
--                    stageHeight: appContainer.height
++                    boundsItem: boundariesForWindowPlacement
                      onFakeMaximizeAnimationRequested: if (!appDelegate.maximized) fakeRectangle.maximize(amount, true)
                      onFakeMaximizeLeftAnimationRequested: if (!appDelegate.maximizedLeft) fakeRectangle.maximizeLeft(amount, true)
@@ -1703,6 +1709,41 @@
                          sourceSize.height: height
+                     }
+                 }
++
++                Item {
++                    // Group all child windows in this item so that we can fade them out together when going to the spread
++                    // (and fade them in back again when returning from it)
++                    readonly property bool stageOnProperState: root.state === "windowed"
++                                                            || root.state === "staged"
++                                                            || root.state === "stagedWithSideStage"
++
++                    // TODO: Is it worth the extra cost of layering to avoid the opacity artifacts of intersecting children?
++                    //       Btw, will involve more than uncommenting the line below as children won't necessarily fit this item's
++                    //       geometry. This is just a reference.
++                    //layer.enabled: opacity !== 0.0 && opacity !== 1.0
++
++                    opacity: stageOnProperState ? 1.0 : 0.0
++                    visible: opacity !== 0.0 // make it transparent to input as well
++                    Behavior on opacity { UbuntuNumberAnimation {} }
++
++                    Repeater {
++                        id: childWindowRepeater
++                        model: appDelegate.surface ? appDelegate.surface.childSurfaceList : null
++
++                        delegate: ChildWindowTree {
++                            surface: model.surface
++
++                            // Account for the displacement caused by window decoration in the top-level surface
++                            // Ie, the top-level surface is not positioned at (0,0) of this ChildWindow's parent (appDelegate)
++                            displacementX: appDelegate.clientAreaItem.x
++                            displacementY: appDelegate.clientAreaItem.y
++
++                            boundsItem: boundariesForWindowPlacement
++
++                            z: childWindowRepeater.count - model.index
++                        }
++                    }
++                }
+             }
+         }
+     }
 === modified file 'qml/Stage/WindowControlsOverlay.qml'
 --- qml/Stage/WindowControlsOverlay.qml	2016-12-27 22:09:12 +0000
 +++ qml/Stage/WindowControlsOverlay.qml	2017-01-19 15:00:39 +0000
@@ -18,17 +18,14 @@
  import Ubuntu.Components 1.3
  import Ubuntu.Gestures 0.1
  import Unity.Application 0.1
--import "../Components/PanelState"
  Item {
      id: root
--    enabled: target && !target.fullscreen
--    anchors.fill: target
      // to be set from outside
      property Item target // appDelegate
--    property alias stageWidth: moveHandler.stageWidth
--    property alias stageHeight: moveHandler.stageHeight
++    property WindowResizeArea resizeArea
++    property Item boundsItem
      // to be read from outside
      readonly property alias overlayShown: overlay.visible
@@ -90,9 +87,7 @@
      QtObject {
          id: priv
--        readonly property var resizeArea: root.target && root.target.resizeArea ? root.target.resizeArea : null
--        readonly property bool ensureWindow: root.target.state == "normal" || root.target.state == "restored"
--        readonly property bool dragging: moveHandler.dragging || (resizeArea && resizeArea.dragging)
++        readonly property bool dragging: moveHandler.dragging || (root.resizeArea && root.resizeArea.dragging)
          function getSensingPoints() {
              var xPoints = [];
@@ -162,6 +157,8 @@
                  objectName: "moveHandler"
                  target: root.target
++                boundsItem: root.boundsItem
++
                  onFakeMaximizeAnimationRequested: root.fakeMaximizeAnimationRequested(amount)
                  onFakeMaximizeLeftAnimationRequested: root.fakeMaximizeLeftAnimationRequested(amount)
                  onFakeMaximizeRightAnimationRequested: root.fakeMaximizeRightAnimationRequested(amount)
@@ -193,65 +190,65 @@
          ResizeGrip { // top left
              anchors.horizontalCenter: parent.left
              anchors.verticalCenter: parent.top
--            visible: priv.ensureWindow || target.maximizedBottomRight
--            resizeTarget: priv.resizeArea
++            visible: root.enabled || target.maximizedBottomRight
++            resizeTarget: root.resizeArea
+         }
          ResizeGrip { // top center
              anchors.horizontalCenter: parent.horizontalCenter
              anchors.verticalCenter: parent.top
              rotation: 45
--            visible: priv.ensureWindow || target.maximizedHorizontally || target.maximizedBottomLeft || target.maximizedBottomRight
--            resizeTarget: priv.resizeArea
++            visible: root.enabled || target.maximizedHorizontally || target.maximizedBottomLeft || target.maximizedBottomRight
++            resizeTarget: root.resizeArea
+         }
          ResizeGrip { // top right
              anchors.horizontalCenter: parent.right
              anchors.verticalCenter: parent.top
              rotation: 90
--            visible: priv.ensureWindow || target.maximizedBottomLeft
--            resizeTarget: priv.resizeArea
++            visible: root.enabled || target.maximizedBottomLeft
++            resizeTarget: root.resizeArea
+         }
          ResizeGrip { // right
              anchors.horizontalCenter: parent.right
              anchors.verticalCenter: parent.verticalCenter
              rotation: 135
--            visible: priv.ensureWindow || target.maximizedVertically || target.maximizedLeft ||
++            visible: root.enabled || target.maximizedVertically || target.maximizedLeft ||
                       target.maximizedTopLeft || target.maximizedBottomLeft
--            resizeTarget: priv.resizeArea
++            resizeTarget: root.resizeArea
+         }
          ResizeGrip { // bottom right
              anchors.horizontalCenter: parent.right
              anchors.verticalCenter: parent.bottom
--            visible: priv.ensureWindow || target.maximizedTopLeft
--            resizeTarget: priv.resizeArea
++            visible: root.enabled || target.maximizedTopLeft
++            resizeTarget: root.resizeArea
+         }
          ResizeGrip { // bottom center
              anchors.horizontalCenter: parent.horizontalCenter
              anchors.verticalCenter: parent.bottom
              rotation: 45
--            visible: priv.ensureWindow || target.maximizedHorizontally || target.maximizedTopLeft || target.maximizedTopRight
--            resizeTarget: priv.resizeArea
++            visible: root.enabled || target.maximizedHorizontally || target.maximizedTopLeft || target.maximizedTopRight
++            resizeTarget: root.resizeArea
+         }
          ResizeGrip { // bottom left
              anchors.horizontalCenter: parent.left
              anchors.verticalCenter: parent.bottom
              rotation: 90
--            visible: priv.ensureWindow || target.maximizedTopRight
--            resizeTarget: priv.resizeArea
++            visible: root.enabled || target.maximizedTopRight
++            resizeTarget: root.resizeArea
+         }
          ResizeGrip { // left
              anchors.horizontalCenter: parent.left
              anchors.verticalCenter: parent.verticalCenter
              rotation: 135
--            visible: priv.ensureWindow || target.maximizedVertically || target.maximizedRight ||
++            visible: root.enabled || target.maximizedVertically || target.maximizedRight ||
                       target.maximizedTopRight || target.maximizedBottomRight
--            resizeTarget: priv.resizeArea
++            resizeTarget: root.resizeArea
+         }
+     }
+ }
 === modified file 'qml/Stage/WindowDecoration.qml'
 --- qml/Stage/WindowDecoration.qml	2016-12-12 11:16:47 +0000
 +++ qml/Stage/WindowDecoration.qml	2017-01-19 15:00:39 +0000
@@ -28,6 +28,7 @@
      property alias closeButtonVisible: buttons.closeButtonShown
      property alias title: titleLabel.text
      property alias maximizeButtonShown: buttons.maximizeButtonShown
++    property alias minimizeButtonVisible: buttons.minimizeButtonVisible
      property bool active: false
      property alias overlayShown: buttons.overlayShown
      property var menu: undefined
@@ -38,6 +39,10 @@
      acceptedButtons: Qt.AllButtons // prevent leaking unhandled mouse events
      hoverEnabled: true
++    drag.target: Item {}
++    drag.filterChildren: true
++    drag.threshold: 0
++
      signal closeClicked()
      signal minimizeClicked()
      signal maximizeClicked()
@@ -64,8 +69,8 @@
                                         (menuBar.showRequested || root.containsMouse)
+     }
--    // We dont want touch events to fall through to parent,
--    // otherwise the containsMouse will not work.
++    // We dont want touch events to fall through to parent as it expect some child MouseArea to have them
++    // If not some MouseArea in the menu bar, it will be this one.
      MouseArea {
          anchors.fill: parent
          propagateComposedEvents: true
 === modified file 'qml/Stage/WindowResizeArea.qml'
 --- qml/Stage/WindowResizeArea.qml	2016-12-12 16:45:09 +0000
 +++ qml/Stage/WindowResizeArea.qml	2017-01-19 15:00:39 +0000
@@ -32,7 +32,7 @@
      // The area will anchor to it and manage resize events
      property Item target: null
      property int borderThickness: 0
--    property real minimumY: -100000000 // By default, impose no limit
++    property Item boundsItem
      property int minWidth: 0
      property int minHeight: 0
@@ -243,7 +243,8 @@
+         }
          if (d.topBorder) {
--            var newTargetY = Math.max(d.startY + deltaY, root.minimumY);
++            var bounds = boundsItem.mapToItem(target.parent, 0, 0, boundsItem.width, boundsItem.height);
++            var newTargetY = Math.max(d.startY + deltaY, bounds.y);
              var bottomBorderY = target.windowedY + target.height;
              if (bottomBorderY > newTargetY + d.minimumHeight) {
                  if (bottomBorderY < newTargetY + d.maximumHeight) {
 === modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
 --- tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-12-20 15:50:41 +0000
 +++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2017-01-19 15:00:39 +0000
@@ -94,6 +94,7 @@
      auto surface = surfaceManager->createSurface(QString("prompt foo"),
              Mir::NormalType,
              Mir::RestoredState,
++            nullptr, /* parentSurface */
              screenshotUrl);
      surfaceManager->notifySurfaceCreated(surface);
@@ -122,7 +123,9 @@
      auto surface = surfaceManager->createSurface(surfaceName,
             Mir::NormalType,
             fullscreen() ? Mir::FullscreenState : Mir::RestoredState,
--           m_screenshotFileName);
++            nullptr, /* parentSurface */
++           m_screenshotFileName,
++           m_qmlFilePath);
      surface->setShellChrome(m_shellChrome);
@@ -201,6 +204,11 @@
+     }
+ }
++void ApplicationInfo::setQmlFilename(const QString &qmlFilename)
++{
++    m_qmlFilePath = QString("qrc:///Unity/Application/%1").arg(qmlFilename);
++}
++
  void ApplicationInfo::setName(const QString &value)
+ {
      if (value != m_name) {
 === modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
 --- tests/mocks/Unity/Application/ApplicationInfo.h	2016-12-23 11:05:09 +0000
 +++ tests/mocks/Unity/Application/ApplicationInfo.h	2017-01-19 15:00:39 +0000
@@ -29,6 +29,7 @@
  #include <QList>
  #include <QTimer>
++#include <QUrl>
  using namespace unity::shell::application;
@@ -58,6 +59,7 @@
      void setIconId(const QString &iconId);
      void setScreenshotId(const QString &screenshotId);
++    void setQmlFilename(const QString &);
      void setAppId(const QString &value) { m_appId = value; }
      QString appId() const override { return m_appId; }
@@ -152,6 +154,7 @@
      QList<MirSurface*> m_closingSurfaces;
      bool m_manualSurfaceCreation{false};
      Mir::ShellChrome m_shellChrome{Mir::NormalChrome};
++    QUrl m_qmlFilePath;
  };
  Q_DECLARE_METATYPE(ApplicationInfo*)
 === modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
 --- tests/mocks/Unity/Application/ApplicationManager.cpp	2016-12-07 11:19:17 +0000
 +++ tests/mocks/Unity/Application/ApplicationManager.cpp	2017-01-19 15:00:39 +0000
@@ -480,6 +480,15 @@
      application->setName("Primary Oriented");
      application->setSupportedOrientations(Qt::PrimaryOrientation);
      m_availableApplications.append(application);
++
++    application = new ApplicationInfo(this);
++    application->setAppId("kate");
++    application->setName("Kate");
++    application->setIconId("libreoffice");
++    application->setScreenshotId("libreoffice");
++    application->setQmlFilename("Kate.qml");
++    application->setIsTouchApp(false);
++    m_availableApplications.append(application);
+ }
 === modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
 --- tests/mocks/Unity/Application/MirSurface.cpp	2016-12-02 18:15:36 +0000
 +++ tests/mocks/Unity/Application/MirSurface.cpp	2017-01-19 15:00:39 +0000
@@ -74,6 +74,7 @@
  MirSurface::MirSurface(const QString& name,
          Mir::Type type,
          Mir::State state,
++        MirSurface *parentSurface,
          const QUrl& screenshot,
          const QUrl &qmlFilePath)
      : unity::shell::application::MirSurfaceInterface(nullptr)
@@ -90,6 +91,8 @@
      , m_height(-1)
      , m_slowToResize(false)
      , m_shellChrome(Mir::NormalChrome)
++    , m_parentSurface(parentSurface)
++    , m_childSurfaceList(new MirSurfaceListModel(this))
+ {
      DEBUG_MSG("state=" << stateToStr(state));
@@ -493,6 +496,36 @@
+     }
+ }
++void MirSurface::openMenu(qreal x, qreal y, qreal width, qreal height)
++{
++    auto *menu = SurfaceManager::instance()->createSurface("menu", Mir::MenuType, Mir::HiddenState,
++            this /* parentSurface */,
++            QUrl() /* screenshot */,
++            QUrl("qrc:///Unity/Application/KateMenu.qml"));
++
++    menu->setRequestedPosition(QPoint(x,y));
++    menu->resize(width, height);
++    menu->requestState(Mir::RestoredState);
++
++    SurfaceManager::instance()->notifySurfaceCreated(menu);
++}
++
++void MirSurface::openDialog(qreal x, qreal y, qreal width, qreal height)
++{
++    auto *dialog = SurfaceManager::instance()->createSurface("dialog", Mir::DialogType, Mir::HiddenState,
++            this /* parentSurface */,
++            QUrl() /* screenshot */,
++            QUrl("qrc:///Unity/Application/KateDialog.qml"));
++
++    dialog->setRequestedPosition(QPoint(x,y));
++    dialog->resize(width, height);
++    dialog->requestState(Mir::RestoredState);
++
++    SurfaceManager::instance()->notifySurfaceCreated(dialog);
++
++    dialog->requestFocus();
++}
++
  void MirSurface::setRequestedPosition(const QPoint &value)
+ {
      if (value != m_requestedPosition) {
@@ -505,3 +538,13 @@
          Q_EMIT positionChanged(m_position);
+     }
+ }
++
++MirSurfaceInterface* MirSurface::parentSurface() const
++{
++    return m_parentSurface;
++}
++
++MirSurfaceListInterface* MirSurface::childSurfaceList() const
++{
++    return m_childSurfaceList;
++}
 === modified file 'tests/mocks/Unity/Application/MirSurface.h'
 --- tests/mocks/Unity/Application/MirSurface.h	2016-12-03 18:41:45 +0000
 +++ tests/mocks/Unity/Application/MirSurface.h	2017-01-19 15:00:39 +0000
@@ -45,6 +45,7 @@
      MirSurface(const QString& name,
              Mir::Type type,
              Mir::State state,
++            MirSurface *parentSurface,
              const QUrl& screenshot,
              const QUrl &qmlFilePath = QUrl());
      virtual ~MirSurface();
@@ -94,6 +95,9 @@
      QPoint requestedPosition() const override { return m_requestedPosition; }
      void setRequestedPosition(const QPoint &) override;
++    unity::shell::application::MirSurfaceInterface* parentSurface() const override;
++    unity::shell::application::MirSurfaceListInterface* childSurfaceList() const override;
++
      Q_INVOKABLE void close() override;
      Q_INVOKABLE void activate() override;
@@ -121,6 +125,9 @@
      Q_INVOKABLE virtual void setInputBounds(const QRect &boundsRect);
++    Q_INVOKABLE void openMenu(qreal x, qreal y, qreal width, qreal height);
++    Q_INVOKABLE void openDialog(qreal x, qreal y, qreal width, qreal height);
++
      /////
      // internal mock stuff
@@ -216,6 +223,10 @@
      QPoint m_position;
      QPoint m_requestedPosition;
++
++    unity::shell::application::MirSurfaceInterface* m_parentSurface;
++
++    MirSurfaceListModel *m_childSurfaceList;
  };
  #endif // MOCK_MIR_SURFACE_H
 === modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
 --- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2016-12-23 11:05:09 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2017-01-19 15:00:39 +0000
@@ -159,7 +159,9 @@
      if (m_qmlItem) {
          QQmlProperty orientationProp(m_qmlItem, "orientationAngle");
--        orientationProp.write(QVariant::fromValue(orientationAngle()));
++        if (orientationProp.isValid()) {
++            orientationProp.write(QVariant::fromValue(orientationAngle()));
++        }
+     }
+ }
@@ -167,7 +169,9 @@
+ {
      if (m_qmlItem) {
          QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
--        screenshotSource.write(QVariant::fromValue(screenshotUrl));
++        if (screenshotSource.isValid()) {
++            screenshotSource.write(QVariant::fromValue(screenshotUrl));
++        }
+     }
+ }
@@ -193,12 +197,23 @@
+     {
          QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
--        screenshotSource.write(QVariant::fromValue(m_qmlSurface->screenshotUrl()));
++        if (screenshotSource.isValid()) {
++            screenshotSource.write(QVariant::fromValue(m_qmlSurface->screenshotUrl()));
++        }
+     }
+     {
          QQmlProperty orientationProp(m_qmlItem, "orientationAngle");
--        orientationProp.write(QVariant::fromValue(orientationAngle()));
++        if (orientationProp.isValid()) {
++            orientationProp.write(QVariant::fromValue(orientationAngle()));
++        }
++    }
++
++    {
++        QQmlProperty surfaceProperty(m_qmlItem, "surface");
++        if (surfaceProperty.isValid()) {
++            surfaceProperty.write(QVariant::fromValue(m_qmlSurface));
++        }
+     }
+ }
 === modified file 'tests/mocks/Unity/Application/MirSurfaceListModel.h'
 --- tests/mocks/Unity/Application/MirSurfaceListModel.h	2016-11-30 19:24:02 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceListModel.h	2017-01-19 15:00:39 +0000
@@ -44,7 +44,6 @@
      bool contains(MirSurface *surface) const { return m_surfaceList.contains(surface); }
  private:
--    void appendSurface(MirSurface *surface);
      void raise(MirSurface *surface);
      void moveSurface(int from, int to);
      void connectSurface(MirSurface *surface);
 === modified file 'tests/mocks/Unity/Application/SurfaceManager.cpp'
 --- tests/mocks/Unity/Application/SurfaceManager.cpp	2017-01-03 12:45:42 +0000
 +++ tests/mocks/Unity/Application/SurfaceManager.cpp	2017-01-19 15:00:39 +0000
@@ -61,10 +61,15 @@
  MirSurface *SurfaceManager::createSurface(const QString& name,
                                            Mir::Type type,
                                            Mir::State state,
--                                          const QUrl& screenshot)
++                                          MirSurface *parentSurface,
++                                          const QUrl &screenshot,
++                                          const QUrl &qmlFilePath)
+ {
--    MirSurface* surface = new MirSurface(name, type, state, screenshot);
++    MirSurface* surface = new MirSurface(name, type, state, parentSurface, screenshot, qmlFilePath);
      registerSurface(surface);
++    if (parentSurface) {
++        static_cast<MirSurfaceListModel*>(parentSurface->childSurfaceList())->addSurface(surface);
++    }
      return surface;
+ }
@@ -72,12 +77,14 @@
+ {
      m_surfaces.prepend(surface);
--    surface->setMinimumWidth(m_newSurfaceMinimumWidth);
--    surface->setMaximumWidth(m_newSurfaceMaximumWidth);
--    surface->setMinimumHeight(m_newSurfaceMinimumHeight);
--    surface->setMaximumHeight(m_newSurfaceMaximumHeight);
--    surface->setWidthIncrement(m_newSurfaceWidthIncrement);
--    surface->setHeightIncrement(m_newSurfaceHeightIncrement);
++    if (!surface->parentSurface()) {
++        surface->setMinimumWidth(m_newSurfaceMinimumWidth);
++        surface->setMaximumWidth(m_newSurfaceMaximumWidth);
++        surface->setMinimumHeight(m_newSurfaceMinimumHeight);
++        surface->setMaximumHeight(m_newSurfaceMaximumHeight);
++        surface->setWidthIncrement(m_newSurfaceWidthIncrement);
++        surface->setHeightIncrement(m_newSurfaceHeightIncrement);
++    }
      connect(surface, &MirSurface::stateRequested, this, [=](Mir::State state) {
          this->onStateRequested(surface, state);
 === modified file 'tests/mocks/Unity/Application/SurfaceManager.h'
 --- tests/mocks/Unity/Application/SurfaceManager.h	2017-01-03 12:45:42 +0000
 +++ tests/mocks/Unity/Application/SurfaceManager.h	2017-01-19 15:00:39 +0000
@@ -49,7 +49,9 @@
      Q_INVOKABLE MirSurface* createSurface(const QString& name,
                                    Mir::Type type,
                                    Mir::State state,
--                                  const QUrl& screenshot);
++                                  MirSurface *parentSurface,
++                                  const QUrl &screenshot,
++                                  const QUrl &qmlFilePath = QUrl());
      void notifySurfaceCreated(unity::shell::application::MirSurfaceInterface *);
 === modified file 'tests/mocks/Unity/Application/VirtualKeyboard.cpp'
 --- tests/mocks/Unity/Application/VirtualKeyboard.cpp	2016-09-26 12:25:19 +0000
 +++ tests/mocks/Unity/Application/VirtualKeyboard.cpp	2017-01-19 15:00:39 +0000
@@ -24,10 +24,11 @@
  VirtualKeyboard::VirtualKeyboard()
      : MirSurface("input-method",
--                     Mir::InputMethodType,
--                     Mir::MinimizedState,
--                     QUrl("qrc:///Unity/Application/vkb_portrait.png"),
--                     QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"))
++                 Mir::InputMethodType,
++                 Mir::MinimizedState,
++                 nullptr, /* parentSurface */
++                 QUrl("qrc:///Unity/Application/vkb_portrait.png"),
++                 QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"))
+ {
+ }
 === added file 'tests/mocks/Unity/Application/resources/Kate.qml'
 --- tests/mocks/Unity/Application/resources/Kate.qml	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/Application/resources/Kate.qml	2017-01-19 15:00:39 +0000
@@ -0,0 +1,49 @@
++/*
++ * 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 Ubuntu.Components 1.3
++
++Rectangle {
++    id: root
++    color: "white"
++    implicitWidth: width
++    implicitHeight: height
++
++    property var surface
++
++    Column {
++        Button {
++            text: "Open Menu"
++            property real nextY: y
++            property real menuHeight: units.gu(5)
++            onClicked: {
++                surface.openMenu(x+width, nextY, units.gu(10), menuHeight);
++                nextY += menuHeight + units.gu(.5)
++            }
++        }
++
++        Button {
++            text: "Open Dialog"
++            property real dialogWidth: units.gu(30)
++            property real dialogHeight: units.gu(20)
++            onClicked: {
++                surface.openDialog(root.x+(root.width/2)-(dialogWidth/2), root.y+(root.height/2)-(dialogHeight/2),
++                                   dialogWidth, dialogHeight);
++            }
++        }
++    }
++}
 === added file 'tests/mocks/Unity/Application/resources/KateDialog.qml'
 --- tests/mocks/Unity/Application/resources/KateDialog.qml	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/Application/resources/KateDialog.qml	2017-01-19 15:00:39 +0000
@@ -0,0 +1,48 @@
++/*
++ * 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 Ubuntu.Components 1.3
++
++Rectangle {
++    id: root
++    color: "grey"
++    implicitWidth: width
++    implicitHeight: height
++
++    property var surface
++
++    Text {
++        anchors.left: parent.left
++        anchors.right: parent.right
++        horizontalAlignment: Text.AlignHCenter
++        verticalAlignment: Text.AlignVCenter
++        text: "This is a child dialog."
++    }
++
++    Row {
++        anchors.bottom: parent.bottom
++        anchors.right: parent.right
++        Button {
++            text: "OK"
++            onClicked: root.surface.close()
++        }
++        Button {
++            text: "Cancel"
++            onClicked: root.surface.close()
++        }
++    }
++}
 === added file 'tests/mocks/Unity/Application/resources/KateMenu.qml'
 --- tests/mocks/Unity/Application/resources/KateMenu.qml	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/Application/resources/KateMenu.qml	2017-01-19 15:00:39 +0000
@@ -0,0 +1,41 @@
++/*
++ * 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 Ubuntu.Components 1.3
++
++Rectangle {
++    id: root
++    color: "grey"
++    implicitWidth: width
++    implicitHeight: height
++
++    property var surface
++
++    Text {
++        anchors.centerIn: parent
++        text: "menu"
++    }
++    MouseArea {
++        anchors.fill: parent
++        property real nextY: 0
++        onClicked: {
++            // ensure some overlap with is parent in order to visually check for nested opacity artifacts
++            root.surface.openMenu(x+(width*0.6), nextY, units.gu(10), root.height);
++            nextY += root.height
++        }
++    }
++}
 === modified file 'tests/mocks/Unity/Application/resources/surfaces.qrc'
 --- tests/mocks/Unity/Application/resources/surfaces.qrc	2015-11-05 17:59:16 +0000
 +++ tests/mocks/Unity/Application/resources/surfaces.qrc	2017-01-19 15:00:39 +0000
@@ -1,5 +1,8 @@
  <RCC>
      <qresource prefix="/Unity/Application">
++        <file>Kate.qml</file>
++        <file>KateDialog.qml</file>
++        <file>KateMenu.qml</file>
          <file>VirtualKeyboard.qml</file>
          <file>MirSurfaceItem.qml</file>
          <file>vkb_portrait.png</file>
 === modified file 'tests/qmltests/Stage/ApplicationCheckBox.qml'
 --- tests/qmltests/Stage/ApplicationCheckBox.qml	2016-11-30 19:24:02 +0000
 +++ tests/qmltests/Stage/ApplicationCheckBox.qml	2017-01-19 15:00:39 +0000
@@ -162,7 +162,7 @@
+         }
+     }
--    // Rows of application surfaces
++    // Rows of top-level application surfaces
      Repeater {
          model: d.application ? d.application.surfaceList : null
          RowLayout {
 === modified file 'tests/qmltests/Stage/tst_WindowResizeArea.qml'
 --- tests/qmltests/Stage/tst_WindowResizeArea.qml	2016-12-21 16:20:58 +0000
 +++ tests/qmltests/Stage/tst_WindowResizeArea.qml	2017-01-19 15:00:39 +0000
@@ -90,6 +90,7 @@
                  id: windowResizeArea
                  anchors.fill: parent
                  target: fakeWindow
++                boundsItem: bounds
                  borderThickness: units.gu(2)
                  minWidth: units.gu(15)
                  minHeight: units.gu(10)
@@ -121,7 +122,16 @@
          active: windowLoaderCheckbox.checked
+     }
++    Item {
++        id: bounds
++        anchors.left: parent.left
++        anchors.top: parent.top
++        anchors.right: controls.left
++        anchors.bottom: parent.bottom
++    }
++
      Rectangle {
++        id: controls
          anchors.right: parent.right
          anchors.top: parent.top
          anchors.bottom: parent.bottom