Merge into trunk : newWindowDecosAndPanel : Code : Unity 8

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-11-20
Daniel d'Andrada (community)		2015-11-05	Approve on 2015-11-20
Review via email: mp+276810@code.launchpad.net

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

#

Text conflict in qml/Components/WindowControlButtons.qml
Text conflict in qml/Panel/Panel.qml
Text conflict in qml/Stages/DecoratedWindow.qml
Text conflict in qml/Stages/DesktopStage.qml
Text conflict in tests/qmltests/Stages/tst_DesktopStage.qml
5 conflicts encountered.

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

#

Conflicts resolved

Daniel d'Andrada (dandrader) wrote on 2015-11-06:

#

I think it's worth considering using pre-rendered images (PNGs) instead of rendering them at runtime from SVGs for performance reasons.

We keep the SVG, but also ship a couple or prerendered versions at common grid unit resolutions (like for 1080p monitors, etc). So if we don't have a PNG for the grid unit at hand, we fallback to rendering one at runtime from the original SVG.

And maybe that scheme could be turned into a component of its own.

Daniel d'Andrada (dandrader) wrote on 2015-11-06:

#

> I think it's worth considering using pre-rendered images (PNGs) instead of
> rendering them at runtime from SVGs for performance reasons.
>
> We keep the SVG, but also ship a couple or prerendered versions at common grid
> unit resolutions (like for 1080p monitors, etc). So if we don't have a PNG for
> the grid unit at hand, we fallback to rendering one at runtime from the
> original SVG.
>
> And maybe that scheme could be turned into a component of its own.

I recall this had a significant impact on start up time back in 2010/2011. Not sure how relevant it still is with todays hardware.

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

#

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-09

2047. By Lukáš Tinkl on 2015-11-09: restoreFromMinimized() -> restore()
restore() -> restoreFromMaximized()

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

#

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-09

2048. By Lukáš Tinkl on 2015-11-09: bring back the panel hiding/showing animations

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

#

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

review: Needs Fixing (continuous-integration)

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

#

> > I think it's worth considering using pre-rendered images (PNGs) instead of
> > rendering them at runtime from SVGs for performance reasons.
> >
> > We keep the SVG, but also ship a couple or prerendered versions at common
> grid
> > unit resolutions (like for 1080p monitors, etc). So if we don't have a PNG
> for
> > the grid unit at hand, we fallback to rendering one at runtime from the
> > original SVG.
> >
> > And maybe that scheme could be turned into a component of its own.
>
> I recall this had a significant impact on start up time back in 2010/2011. Not
> sure how relevant it still is with todays hardware.

This doesn't seem to have any impact on performance, design would be fine with giving me whatever format assets we want I guess.

I feel like going with SVGs has the advantage of being able to freely resize the decoration once we allow clients to provide their own in the longterm.

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

#

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

review: Needs Fixing (continuous-integration)

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

#

Could you please remove all those empty <g></g> from the SVGs?

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

#

> This doesn't seem to have any impact on performance

Sure, as it's used only for a couple of small images. But it might if adoption becomes widespread throughout unity8, specially on phones. We can worry about it once we get there.

review: Resubmit

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

#

Don't know how to reset it. "Abstain" will do it for now...

review: Abstain

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

#

- run "make tryDesktopStage"
- Launch camera-app, gallery-app and webbrowser-app

Why are those apps being launched fullscreen now?

review: Needs Information

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

#

By the way, what about those rounded corner I saw in the design mock up. Should we have a trello card for it or was it dropped?

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

#

Is qml/Stages/graphics/window-close.svg being used for anything anymore?

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

#

There's not a shadow around the indicators panel (that thing that you drag down from the top) anymore. Instead, there's just a black line on its left side. Is it how design intended?

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

#

- run "make tryShell
- select desktop size
- select desktop usage scenario
- unlock the shell (dismiss lockscreen)
- Click on the indicators bar grey area between the focused app name and the indicators icons

This is what you get:
qml/Stages/DesktopStage.qml:178: TypeError: Cannot read property 'appId' of null

review: Needs Fixing

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

#

I don't get why you set "hoverEnabled: true" on that MouseArea where you put WindowControlButtons in Panel.qml.

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

#

Still in Panel.qml:

"// TODO here would the LIM come"

What's "LIM"? Also the sentence doesn't look grammatically correct.

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

#

Would it be too much to ask for adding a way to show/hide window controls and name in "make tryPanel" so we can see how it interacts with other panel components and states without having to run a fullblown Shell.qml test?

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

#

qml/Panel/PanelBackground.qml doesn't seem to be used anywhere... I removed it and didn't notice any difference. Also grepping for it didn't show anything.

If so, could you please nuke it? It's a pretty ridiculous component anyway... (a Rectangle with a pre-defined color)

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-12

2049. By Lukáš Tinkl on 2015-11-12: sanitize SVGs

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

#

> Could you please remove all those empty <g></g> from the SVGs?

Done

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

#

> - run "make tryDesktopStage"
> - Launch camera-app, gallery-app and webbrowser-app
>
> Why are those apps being launched fullscreen now?

Because of the bugfix for https://bugs.launchpad.net/ubuntu/+source/webbrowser-app/+bug/1511020

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

#

> By the way, what about those rounded corner I saw in the design mock up.
> Should we have a trello card for it or was it dropped?

Right, we will need another task in trello for this (qtmir I suppose)

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

#

> Is qml/Stages/graphics/window-close.svg being used for anything anymore?

Yup, for the desktop spread imo

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

#

In DesktopStage.qml:

Your updateForegroundMaximizedApp() makes unity8 traverse ApplicationManager model once again unnecessarily. The delegates are already ordered according to ApplicationManager model, so their indexes match. No need to look up for it.

review: Needs Fixing

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

#

> > - run "make tryDesktopStage"
> > - Launch camera-app, gallery-app and webbrowser-app
> >
> > Why are those apps being launched fullscreen now?
>
> Because of the bugfix for https://bugs.launchpad.net/ubuntu/+source
> /webbrowser-app/+bug/1511020

Can you please stick to the purpose of this branch and just update the visuals?

Please put this bug fix in a separate merge proposal.

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

#

> Still in Panel.qml:
>
> "// TODO here would the LIM come"
>
> What's "LIM"? Also the sentence doesn't look grammatically correct.

Locally integrated menus

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

#

> I don't get why you set "hoverEnabled: true" on that MouseArea where you put
> WindowControlButtons in Panel.qml.

Because the whole group is visible only on mouse over _and_ I need the individual mouse over visual effect when hovering over a single button. Any idea how to do that better?

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

#

On 12/11/2015 11:04, Lukáš Tinkl wrote:
>> Still in Panel.qml:
>>
>> "// TODO here would the LIM come"
>>
>> What's "LIM"? Also the sentence doesn't look grammatically correct.
> Locally integrated menus

Please write it down in full. Acronyms just hamper communication.

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-12

2050. By Lukáš Tinkl on 2015-11-12: nuke unused component

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

#

> qml/Panel/PanelBackground.qml doesn't seem to be used anywhere... I removed it
> and didn't notice any difference. Also grepping for it didn't show anything.
>
> If so, could you please nuke it? It's a pretty ridiculous component anyway...
> (a Rectangle with a pre-defined color)

Yup, it's gone

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

#

> In DesktopStage.qml:
>
> Your updateForegroundMaximizedApp() makes unity8 traverse ApplicationManager
> model once again unnecessarily. The delegates are already ordered according to
> ApplicationManager model, so their indexes match. No need to look up for it.

Not quite the same, the window might be maximized (its state) but not visually. In other words, the window might be maximized and minimized at the same time.

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-12

2051. By Lukáš Tinkl on 2015-11-12: remove acronyms

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

#

> On 12/11/2015 11:04, Lukáš Tinkl wrote:
> >> Still in Panel.qml:
> >>
> >> "// TODO here would the LIM come"
> >>
> >> What's "LIM"? Also the sentence doesn't look grammatically correct.
> > Locally integrated menus
>
> Please write it down in full. Acronyms just hamper communication.

That's what the design docs use but yea, you're right

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

#

On 12/11/2015 11:10, Lukáš Tinkl wrote:
>> In DesktopStage.qml:
>>
>> Your updateForegroundMaximizedApp() makes unity8 traverse ApplicationManager
>> model once again unnecessarily. The delegates are already ordered according to
>> ApplicationManager model, so their indexes match. No need to look up for it.
> Not quite the same, the window might be maximized (its state) but not visually. In other words, the window might be maximized and minimized at the same time.

Their state doesn't change their index.

appRepeater already iterates on ApplicationManager. I don't get how is
it possible to have a delegate in that repeater whose index differs from
the model it was created from.

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-12

2052. By Lukáš Tinkl on 2015-11-12: fix warning when clicking the panel with no maximized window at all

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

#

> - run "make tryShell
> - select desktop size
> - select desktop usage scenario
> - unlock the shell (dismiss lockscreen)
> - Click on the indicators bar grey area between the focused app name and the
> indicators icons
>
> This is what you get:
> qml/Stages/DesktopStage.qml:178: TypeError: Cannot read property 'appId' of
> null

Fixed

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

#

> On 12/11/2015 11:10, Lukáš Tinkl wrote:
> >> In DesktopStage.qml:
> >>
> >> Your updateForegroundMaximizedApp() makes unity8 traverse
> ApplicationManager
> >> model once again unnecessarily. The delegates are already ordered according
> to
> >> ApplicationManager model, so their indexes match. No need to look up for
> it.
> > Not quite the same, the window might be maximized (its state) but not
> visually. In other words, the window might be maximized and minimized at the
> same time.
>
> Their state doesn't change their index.

And that's problem, I need to know what index is the (visually) maximized window at. To be able to cast the panel drop shadow and focus the correct window when clicking on the panel.

> appRepeater already iterates on ApplicationManager. I don't get how is
> it possible to have a delegate in that repeater whose index differs from
> the model it was created from.

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-12

2053. By Lukáš Tinkl on 2015-11-12: readd the accidentally dropped indicators shadow

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

#

> There's not a shadow around the indicators panel (that thing that you drag
> down from the top) anymore. Instead, there's just a black line on its left
> side. Is it how design intended?

Yup, I re-added it now but there's still the thin black line... dunno where it comes from :) Will investigate

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-12

2054. By Lukáš Tinkl on 2015-11-12: optimize the for loop
2055. By Lukáš Tinkl on 2015-11-12: remove the left black divider for now

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

#

> > There's not a shadow around the indicators panel (that thing that you drag
> > down from the top) anymore. Instead, there's just a black line on its left
> > side. Is it how design intended?
>
> Yup, I re-added it now but there's still the thin black line... dunno where it
> comes from :) Will investigate

Should be fixed now

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

#

> > On 12/11/2015 11:10, Lukáš Tinkl wrote:
> > >> In DesktopStage.qml:
> > >>
> > >> Your updateForegroundMaximizedApp() makes unity8 traverse
> > ApplicationManager
> > >> model once again unnecessarily. The delegates are already ordered
> according
> > to
> > >> ApplicationManager model, so their indexes match. No need to look up for
> > it.
> > > Not quite the same, the window might be maximized (its state) but not
> > visually. In other words, the window might be maximized and minimized at the
> > same time.
> >
> > Their state doesn't change their index.
>
> And that's problem, I need to know what index is the (visually) maximized
> window at. To be able to cast the panel drop shadow and focus the correct
> window when clicking on the panel.
>
> > appRepeater already iterates on ApplicationManager. I don't get how is
> > it possible to have a delegate in that repeater whose index differs from
> > the model it was created from.

Optimized the for loop by returning the already available index from appManager

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

#

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-12

2056. By Lukáš Tinkl on 2015-11-12: add a checkbox to see window control buttons

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

#

> Would it be too much to ask for adding a way to show/hide window controls and
> name in "make tryPanel" so we can see how it interacts with other panel
> components and states without having to run a fullblown Shell.qml test?

Done

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

#

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

review: Needs Fixing (continuous-integration)

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

#

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-13

2057. By Lukáš Tinkl on 2015-11-13: fix some failing tests
2058. By Lukáš Tinkl on 2015-11-13: more shell tests fixing
2059. By Lukáš Tinkl on 2015-11-13: wait for the shell rendering
2060. By Lukáš Tinkl on 2015-11-13: clear the window controls and title when showing the desktop spread

Daniel d'Andrada (dandrader) wrote on 2015-11-16:

#

> > Would it be too much to ask for adding a way to show/hide window controls
> and
> > name in "make tryPanel" so we can see how it interacts with other panel
> > components and states without having to run a fullblown Shell.qml test?
>
> Done

But I don't see the name of the application there when the mouse is not hovering over it.

Daniel d'Andrada (dandrader) wrote on 2015-11-16:

#

- make tryShell
- Select desktop size and desktop usage scenario
- Unlock screen
- Select phone size & usage scenario
- Unlock screen again

Expected outcome:
Indicators bar does not display the focused application name

Actual outcome:
Indicators bar displays the focused application name, like in a desktop usage scenario.

review: Needs Fixing

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

#

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

review: Needs Fixing (continuous-integration)

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

#

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

review: Needs Fixing (continuous-integration)

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

#

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

review: Needs Fixing (continuous-integration)

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

#

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

review: Needs Fixing (continuous-integration)

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

#

> > > Would it be too much to ask for adding a way to show/hide window controls
> > and
> > > name in "make tryPanel" so we can see how it interacts with other panel
> > > components and states without having to run a fullblown Shell.qml test?
> >
> > Done
>
> But I don't see the name of the application there when the mouse is not
> hovering over it.

I don't see any applications in "make tryPanel", what should it show then?

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-18

2061. By Lukáš Tinkl on 2015-11-18

properly destroy PanelState

in order not to leave artifacts behind (window title, controls, etc)

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

#

> - make tryShell
> - Select desktop size and desktop usage scenario
> - Unlock screen
> - Select phone size & usage scenario
> - Unlock screen again
>
> Expected outcome:
> Indicators bar does not display the focused application name
>
> Actual outcome:
> Indicators bar displays the focused application name, like in a desktop usage
> scenario.

Thanks for spotting, fixed

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-18

2062. By Lukáš Tinkl on 2015-11-18: add an option to show a fake window title in panel

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

#

> > > Would it be too much to ask for adding a way to show/hide window controls
> > and
> > > name in "make tryPanel" so we can see how it interacts with other panel
> > > components and states without having to run a fullblown Shell.qml test?
> >
> > Done
>
> But I don't see the name of the application there when the mouse is not
> hovering over it.

Ok, added an option to show a fake window title

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

#

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

review: Needs Fixing (continuous-integration)

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

#

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

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2015-11-19:

#

- Run "make tryShell"
- Select desktop size and usage scenario
- Unlock the screen
- Launch a fullscreen app, like gallery

Expected outcome:
The applications takes the entire area of Shell.qml

Actual outcome:
It doesn't take the space on top that was previously occupied by the indicators bar.

Comments:
I know you said it works when run for real on a laptop/device. But those manual tests should reproduce exactly what happens "for real". Otherwise it undermines the value of qml tests. There's no reason why they should behave differently. This is just high-level QML code afterall.

review: Needs Fixing

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-20

2063. By Lukáš Tinkl on 2015-11-20: merge trunk
2064. By Lukáš Tinkl on 2015-11-20: fix for fullscreen apps not taking the panel height into account

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

#

> - Run "make tryShell"
> - Select desktop size and usage scenario
> - Unlock the screen
> - Launch a fullscreen app, like gallery
>
> Expected outcome:
> The applications takes the entire area of Shell.qml
>
> Actual outcome:
> It doesn't take the space on top that was previously occupied by the
> indicators bar.
>
> Comments:
> I know you said it works when run for real on a laptop/device. But those
> manual tests should reproduce exactly what happens "for real". Otherwise it
> undermines the value of qml tests. There's no reason why they should behave
> differently. This is just high-level QML code afterall.

Fixed

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

#

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

review: Needs Fixing (continuous-integration)

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

#

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

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2015-11-20:

#

In test_tappingOnDecorationFocusesApplication

Please keep launching 3 applications. It's important that neither the "from" nor the "to" applications are focused before the test. That's why a 3rd one is being launched.

I guess the problem is that camera-app is now fullscreen in DesktopStage. So just replace it with another an application that is not fullscreen, like gmail-webapp.

You will have to change its saved mock geometry so that it doesn't overlap unity8-dash or dialer-app.

So just replace camera-app and gallery-app below with other two non-fullscreen apps:

"""
        WindowStateStorage.geometry = {
            'unity8-dash': Qt.rect(0, units.gu(3), units.gu(50), units.gu(40)),
            'dialer-app': Qt.rect(units.gu(51), units.gu(3), units.gu(50), units.gu(40)),
            'camera-app': Qt.rect(0, units.gu(44), units.gu(50), units.gu(40)),
            'gallery-app': Qt.rect(units.gu(51), units.gu(44), units.gu(50), units.gu(40))
        }
"""

I suggest gmail-webapp and twitter-webapp

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2015-11-20:

#

Likewise in test_tappingOnWindowChangesFocusedApp and test_applicationsBecomeVisibleWhenOccludingAppRemoved

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2015-11-20:

#

In test_maximisedAppStaysVisibleWhenAppStarts:

"""
findChild(dashDelegate, "decoratedWindow").maximize();
"""

You should click on the maximize button instead of directly calling an internal function. We should strive to keep code paths as close to real usage as possible.

"""
var dialerApp = startApplication("dialer-app");
"""

I guess you're using dialer-app here because it starts in normal state (ie non-maximed and non-fullscreen). If so, please explicitly check for this condition in the test to have it clear.

review: Needs Fixing

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-20

2065. By Lukáš Tinkl on 2015-11-20: merge trunk
2066. By Lukáš Tinkl on 2015-11-20: fix bad merge
2067. By Lukáš Tinkl on 2015-11-20: amend the test to launch 3 apps and maximize the windows by clicking the button

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

#

Tests now launch 3 apps and use the maximize button manually

Daniel d'Andrada (dandrader) wrote on 2015-11-20:

#

In test_maximizeApplicationHidesSurfacesBehindIt:

I think you should s/camera-app/gmail-webapp/ instead of changing the test code expectations

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2015-11-20:

#

Likewise in test_applicationsBecomeVisibleWhenOccludingAppRemoved()

s/camera-app/gmail-webapp
s/gallery-app/twitter-webapp

review: Needs Fixing

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

#

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-20

2068. By Lukáš Tinkl on 2015-11-20: don't change expectations for maximized apps (that are also fullscreen)

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

#

> In test_maximizeApplicationHidesSurfacesBehindIt:
>
> I think you should s/camera-app/gmail-webapp/ instead of changing the test
> code expectations

Fixed

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

#

> Likewise in test_applicationsBecomeVisibleWhenOccludingAppRemoved()
>
> s/camera-app/gmail-webapp
> s/gallery-app/twitter-webapp

I don't see a problem with this testcase

Daniel d'Andrada (dandrader) wrote on 2015-11-20:

#

test_applicationsBecomeVisibleWhenOccludingAppRemoved now shows an impossible scenario.

In this test you launch gallery-app and click on its maximize button.

But I cannot do it manually because gallery-app starts in fullscreen. No maximize button in sight. That's why I told you to change it into an app that doesn't start in fullscreen.

review: Needs Fixing

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-20

2069. By Lukáš Tinkl on 2015-11-20: s/gallery/gmail

Daniel d'Andrada (dandrader) on 2015-11-20:

#

review: Approve

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

#

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/newWindowDecosAndPanel updated on 2015-11-25

2070. By Lukáš Tinkl on 2015-11-21: merge trunk
2071. By Lukáš Tinkl on 2015-11-23: merge prereq and fix conflicts
2072. By Lukáš Tinkl on 2015-11-23: don't set width/height directly
2073. By Lukáš Tinkl on 2015-11-23: don't hide the decoration when the window is not visible
2074. By Lukáš Tinkl on 2015-11-25: get rid of the dp(2) gap for the orange line
2075. By Lukáš Tinkl on 2015-11-25: #333333 -> #292929
2076. By Lukáš Tinkl on 2015-11-25: get rid of the orange line in the handle
2077. By Lukáš Tinkl on 2015-11-25: Light font weight for the root indicator labels

Unity 8

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

Commit Message

Description of the Change

Unmerged revisions

Preview Diff

Subscribers

 === modified file 'qml/Components/PanelState/PanelState.qml'
 --- qml/Components/PanelState/PanelState.qml	2015-11-09 10:16:18 +0000
 +++ qml/Components/PanelState/PanelState.qml	2015-11-23 13:54:01 +0000
@@ -22,10 +22,11 @@
      property string title: ""
      property bool buttonsVisible: false
--
--    property int panelHeight: 0
++    property bool dropShadow: false
++    property int panelHeight: units.gu(3)
      signal close()
      signal minimize()
      signal maximize()
++    signal focusMaximizedApp()
+ }
 === modified file 'qml/Components/WindowControlButtons.qml'
 --- qml/Components/WindowControlButtons.qml	2015-11-04 14:57:33 +0000
 +++ qml/Components/WindowControlButtons.qml	2015-11-23 13:54:01 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014 Canonical, Ltd.
++ * Copyright (C) 2014-2015 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
@@ -12,8 +12,6 @@
+  *
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors: Michael Zanetti <michael.zanetti@canonical.com>
   */
  import QtQuick 2.4
@@ -21,43 +19,90 @@
  Row {
      id: root
--    spacing: units.gu(0.5)
++    spacing: units.gu(1)
++
++    // to be set from outside
++    property bool active: false
      signal close()
      signal minimize()
      signal maximize()
--    Rectangle {
++    MouseArea {
++        id: closeWindowButton
          objectName: "closeWindowButton"
--        height: parent.height; width: height; radius: height / 2
--        gradient: Gradient {
--            GradientStop { color: "#F49073"; position: 0 }
--            GradientStop { color: "#DF4F1C"; position: 1 }
--        }
--        border.width: units.dp(.5)
--        border.color: "black"
--        MouseArea { anchors.fill: parent; onClicked: root.close() }
++        hoverEnabled: true
++        height: parent.height
++        width: height
++        onClicked: root.close()
++
++        Rectangle {
++            anchors.centerIn: parent
++            width: units.gu(2)
++            height: units.gu(2)
++            radius: height / 2
++            color: "#ed3146"
++            visible: parent.containsMouse
++        }
++        Icon {
++            width: height
++            height: parent.height *.5
++            anchors.centerIn: parent
++            source: "graphics/window-close.svg"
++            color: root.active ? "white" : "#5d5d5d"
++            keyColor: "black"
++        }
+     }
--    Rectangle {
++
++    MouseArea {
++        id: minimizeWindowButton
          objectName: "minimizeWindowButton"
--        height: parent.height; width: height; radius: height / 2
--        gradient: Gradient {
--            GradientStop { color: "#92918C"; position: 0 }
--            GradientStop { color: "#5E5D58"; position: 1 }
--        }
--        border.width: units.dp(.5)
--        border.color: "black"
--        MouseArea { anchors.fill: parent; onClicked: root.minimize() }
++        hoverEnabled: true
++        height: parent.height
++        width: height
++        onClicked: root.minimize()
++
++        Rectangle {
++            anchors.centerIn: parent
++            width: units.gu(2)
++            height: units.gu(2)
++            radius: height / 2
++            color: "#888888"
++            visible: parent.containsMouse
++        }
++        Icon {
++            width: height
++            height: parent.height *.5
++            anchors.centerIn: parent
++            source: "graphics/window-minimize.svg"
++            color: root.active ? "white" : "#5d5d5d"
++            keyColor: "black"
++        }
+     }
--    Rectangle {
++
++    MouseArea {
++        id: maximizeWindowButton
          objectName: "maximizeWindowButton"
--        height: parent.height; width: height; radius: height / 2
--        gradient: Gradient {
--            GradientStop { color: "#92918C"; position: 0 }
--            GradientStop { color: "#5E5D58"; position: 1 }
--        }
--        border.width: units.dp(.5)
--        border.color: "black"
--        MouseArea { anchors.fill: parent; onClicked: root.maximize() }
++        hoverEnabled: true
++        height: parent.height
++        width: height
++        onClicked: root.maximize()
++
++        Rectangle {
++            anchors.centerIn: parent
++            width: units.gu(2)
++            height: units.gu(2)
++            radius: height / 2
++            color: "#888888"
++            visible: parent.containsMouse
++        }
++        Icon {
++            width: height
++            height: parent.height *.5
++            anchors.centerIn: parent
++            source: "graphics/window-maximize.svg"
++            color: root.active ? "white" : "#5d5d5d"
++            keyColor: "black"
++        }
+     }
+ }
 === added file 'qml/Components/graphics/window-close.svg'
 --- qml/Components/graphics/window-close.svg	1970-01-01 00:00:00 +0000
 +++ qml/Components/graphics/window-close.svg	2015-11-23 13:54:01 +0000
@@ -0,0 +1,14 @@
++<?xml version="1.0" encoding="iso-8859-1"?>
++<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
++	 width="94.926px" height="94.926px" viewBox="0 0 94.926 94.926" style="enable-background:new 0 0 94.926 94.926;"
++	 xml:space="preserve">
++<g>
++	<path d="M55.931,47.463L94.306,9.09c0.826-0.827,0.826-2.167,0-2.994L88.833,0.62C88.436,0.224,87.896,0,87.335,0
++		c-0.562,0-1.101,0.224-1.498,0.62L47.463,38.994L9.089,0.62c-0.795-0.795-2.202-0.794-2.995,0L0.622,6.096
++		c-0.827,0.827-0.827,2.167,0,2.994l38.374,38.373L0.622,85.836c-0.827,0.827-0.827,2.167,0,2.994l5.473,5.476
++		c0.397,0.396,0.936,0.62,1.498,0.62s1.1-0.224,1.497-0.62l38.374-38.374l38.374,38.374c0.397,0.396,0.937,0.62,1.498,0.62
++		s1.101-0.224,1.498-0.62l5.473-5.476c0.826-0.827,0.826-2.167,0-2.994L55.931,47.463z"/>
++</g>
++</svg>
 === added file 'qml/Components/graphics/window-maximize.svg'
 --- qml/Components/graphics/window-maximize.svg	1970-01-01 00:00:00 +0000
 +++ qml/Components/graphics/window-maximize.svg	2015-11-23 13:54:01 +0000
@@ -0,0 +1,12 @@
++<?xml version="1.0" encoding="iso-8859-1"?>
++<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
++	 width="459px" height="459px" viewBox="0 0 459 459" style="enable-background:new 0 0 459 459;" xml:space="preserve">
++<g>
++	<g id="check-box-outline-blank">
++		<path d="M408,51v357H51V51H408 M408,0H51C22.95,0,0,22.95,0,51v357c0,28.05,22.95,51,51,51h357c28.05,0,51-22.95,51-51V51
++			C459,22.95,436.05,0,408,0L408,0z"/>
++	</g>
++</g>
++</svg>
 === added file 'qml/Components/graphics/window-minimize.svg'
 --- qml/Components/graphics/window-minimize.svg	1970-01-01 00:00:00 +0000
 +++ qml/Components/graphics/window-minimize.svg	2015-11-23 13:54:01 +0000
@@ -0,0 +1,13 @@
++<?xml version="1.0" encoding="iso-8859-1"?>
++<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
++	 width="121.805px" height="121.804px" viewBox="0 0 121.805 121.804" style="enable-background:new 0 0 121.805 121.804;"
++	 xml:space="preserve">
++<g>
++	<g>
++		<path d="M7.308,68.211h107.188c4.037,0,7.309-3.272,7.309-7.31c0-4.037-3.271-7.309-7.309-7.309H7.308
++			C3.272,53.593,0,56.865,0,60.902C0,64.939,3.272,68.211,7.308,68.211z"/>
++	</g>
++</g>
++</svg>
 === modified file 'qml/Panel/Handle.qml'
 --- qml/Panel/Handle.qml	2015-07-15 15:07:19 +0000
 +++ qml/Panel/Handle.qml	2015-11-23 13:54:01 +0000
@@ -19,7 +19,7 @@
  Rectangle {
      id: handle
--    color: "#333333"
++    color: "#5d5d5d"
      height: units.gu(2)
      property bool active: false
@@ -35,7 +35,7 @@
                  id: dot
                  width: units.dp(3)
                  height: width
--                color: handle.active ? "#de4814" : "#717171"
++                color: handle.active ? UbuntuColors.orange : "#717171"
                  radius: units.dp(1)
+             }
+         }
 === modified file 'qml/Panel/Indicators/client/IndicatorsClient.qml'
 --- qml/Panel/Indicators/client/IndicatorsClient.qml	2015-07-15 15:07:19 +0000
 +++ qml/Panel/Indicators/client/IndicatorsClient.qml	2015-11-23 13:54:01 +0000
@@ -22,7 +22,7 @@
  import Ubuntu.Components.ListItems 1.3 as ListItem
  Rectangle {
--    color: "black"
++    color: "#333333"
      id: root
      Component.onCompleted: {
 === modified file 'qml/Panel/IndicatorsMenu.qml'
 --- qml/Panel/IndicatorsMenu.qml	2015-09-02 07:42:27 +0000
 +++ qml/Panel/IndicatorsMenu.qml	2015-11-23 13:54:01 +0000
@@ -38,7 +38,7 @@
      property bool enableHint: true
      property bool contentEnabled: true
      property bool showOnClick: true
--    property color panelColor: "black"
++    property color panelColor: "#333333"
      signal showTapped(point position)
@@ -110,12 +110,21 @@
              height: units.gu(0.5)
              gradient: Gradient {
                  GradientStop { position: 0.0; color: "transparent" }
--                GradientStop { position: 1.0; color: "black" }
++                GradientStop { position: 1.0; color: "#333333" }
+             }
              opacity: 0.3
+         }
+     }
++    PanelSeparatorLine {
++        id: indicatorOrangeLine
++        anchors {
++            bottom: handle.top
++            left: handle.left
++            right: handle.right
++        }
++    }
++
      Rectangle {
          anchors.fill: bar
          color: panelColor
 === modified file 'qml/Panel/MenuContent.qml'
 --- qml/Panel/MenuContent.qml	2015-07-15 15:13:18 +0000
 +++ qml/Panel/MenuContent.qml	2015-11-23 13:54:01 +0000
@@ -27,7 +27,7 @@
      property QtObject indicatorsModel: null
      property int currentMenuIndex: -1
--    color: "#221e1c" // FIXME not in palette yet
++    color: "#333333" // FIXME not in palette yet
      width: units.gu(40)
      height: units.gu(42)
 === modified file 'qml/Panel/Panel.qml'
 --- qml/Panel/Panel.qml	2015-11-09 10:16:18 +0000
 +++ qml/Panel/Panel.qml	2015-11-23 13:54:01 +0000
@@ -30,23 +30,12 @@
      property real indicatorAreaShowProgress: 1.0
      property bool locked: false
--    opacity: fullscreenMode && indicators.fullyClosed ? 0.0 : 1.0
--
--    Binding {
--        target: PanelState
--        property: "panelHeight"
--        value: root.panelHeight
--    }
--
      Rectangle {
          id: darkenedArea
          property real darkenedOpacity: 0.6
          anchors {
--            top: parent.top
++            fill: parent
              topMargin: panelHeight
--            left: parent.left
--            right: parent.right
--            bottom: parent.bottom
+         }
          color: "black"
          opacity: indicators.unitProgress * darkenedOpacity
@@ -59,16 +48,18 @@
+         }
+     }
++    Binding {
++        target: PanelState
++        property: "panelHeight"
++        value: indicators.minimizedPanelHeight
++    }
++
      Item {
          id: indicatorArea
          objectName: "indicatorArea"
          anchors.fill: parent
--        Behavior on anchors.topMargin {
--            NumberAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing }
--        }
--
          transform: Translate {
              y: indicators.state === "initial"
                  ? (1.0 - indicatorAreaShowProgress) * -d.indicatorHeight
@@ -76,7 +67,7 @@
+         }
          BorderImage {
--            id: dropShadow
++            id: indicatorsDropShadow
              anchors {
                  fill: indicators
                  leftMargin: -units.gu(1)
@@ -86,9 +77,19 @@
              source: "graphics/rectangular_dropshadow.sci"
+         }
++        BorderImage {
++            id: panelDropShadow
++            anchors {
++                fill: indicatorAreaBackground
++                bottomMargin: -units.gu(1)
++            }
++            visible: PanelState.dropShadow && !callHint.visible
++            source: "graphics/rectangular_dropshadow.sci"
++        }
++
          Rectangle {
              id: indicatorAreaBackground
--            color: callHint.visible ? "green" : "black"
++            color: callHint.visible ? "green" : "#333333"
              anchors {
                  top: parent.top
                  left: parent.left
@@ -99,30 +100,6 @@
              Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration } }
+         }
--        PanelSeparatorLine {
--            id: orangeLine
--            anchors {
--                top: indicatorAreaBackground.bottom
--                left: parent.left
--                right: indicators.left
--            }
--            saturation: 1 - indicators.unitProgress
--
--            // Don't let input event pass trough
--            MouseArea { anchors.fill: parent }
--        }
--
--        Image {
--            anchors {
--                top: indicators.top
--                bottom: indicators.bottom
--                right: indicators.left
--                topMargin: indicatorArea.anchors.topMargin + indicators.minimizedPanelHeight
--            }
--            width: units.dp(2)
--            source: "graphics/VerticalDivider.png"
--        }
--
          MouseArea {
              anchors {
                  top: parent.top
@@ -130,7 +107,29 @@
                  right: indicators.left
+             }
              height: indicators.minimizedPanelHeight
--            onClicked: { if (callHint.visible) { callHint.showLiveCall(); } }
++            hoverEnabled: true
++            onClicked: callHint.visible ? callHint.showLiveCall() : PanelState.focusMaximizedApp()
++            onDoubleClicked: PanelState.maximize()
++
++            // WindowControlButtons inside the mouse area, otherwise QML doesn't grok nested hover events :/
++            // cf. https://bugreports.qt.io/browse/QTBUG-32909
++            WindowControlButtons {
++                id: windowControlButtons
++                objectName: "panelWindowControlButtons"
++                anchors {
++                    left: parent.left
++                    top: parent.top
++                    leftMargin: units.gu(1)
++                    topMargin: units.gu(0.5)
++                    bottomMargin: units.gu(0.5)
++                }
++                height: indicators.minimizedPanelHeight - anchors.topMargin - anchors.bottomMargin
++                visible: PanelState.buttonsVisible && parent.containsMouse && !root.locked && !callHint.visible
++                active: PanelState.buttonsVisible
++                onClose: PanelState.close()
++                onMinimize: PanelState.minimize()
++                onMaximize: PanelState.maximize()
++            }
+         }
          IndicatorsMenu {
@@ -146,7 +145,7 @@
              width: root.width - (windowControlButtons.visible ? windowControlButtons.width + titleLabel.width : 0)
              minimizedPanelHeight: units.gu(3)
              expandedPanelHeight: units.gu(7)
--            openedHeight: root.height - indicatorOrangeLine.height
++            openedHeight: root.height
              overFlowWidth: {
                  if (callHint.visible) {
@@ -163,58 +162,34 @@
                      callHint.showLiveCall();
+                 }
+             }
--
--            hideDragHandle {
--                anchors.bottomMargin: -indicatorOrangeLine.height
--            }
--        }
--
--        WindowControlButtons {
--            id: windowControlButtons
--            objectName: "panelWindowControlButtons"
--            anchors {
--                left: parent.left
--                top: parent.top
--                margins: units.gu(0.7)
--            }
--            height: indicators.minimizedPanelHeight - anchors.margins * 2
--            visible: PanelState.buttonsVisible && !root.locked
--            onClose: PanelState.close()
--            onMinimize: PanelState.minimize()
--            onMaximize: PanelState.maximize()
+         }
          Label {
              id: titleLabel
              objectName: "windowDecorationTitle"
              anchors {
--                left: windowControlButtons.right
++                left: parent.left
                  top: parent.top
--                margins: units.gu(0.7)
++                leftMargin: units.gu(1)
++                topMargin: units.gu(0.5)
++                bottomMargin: units.gu(0.5)
+             }
--            color: "#DFDBD2"
--            height: windowControlButtons.height
--            visible: windowControlButtons.visible
++            color: PanelState.buttonsVisible ? "#ffffff" : "#5d5d5d"
++            height: indicators.minimizedPanelHeight - anchors.topMargin - anchors.bottomMargin
++            visible: !windowControlButtons.visible && !root.locked && !callHint.visible
              verticalAlignment: Text.AlignVCenter
--            fontSize: "small"
--            font.bold: true
++            fontSize: "medium"
++            font.weight: Font.Normal
              text: PanelState.title
+         }
--        PanelSeparatorLine {
--            id: indicatorOrangeLine
--            anchors {
--                top: indicators.bottom
--                left: indicators.left
--                right: indicators.right
--            }
--        }
++        // TODO here would the Locally integrated menus come
          ActiveCallHint {
              id: __callHint
              anchors {
                  top: parent.top
--                left: windowControlButtons.visible ? windowControlButtons.right : parent.left
++                left: parent.left
+             }
              height: indicators.minimizedPanelHeight
              visible: active && indicators.state == "initial"
@@ -224,7 +199,7 @@
      QtObject {
          id: d
          objectName: "panelPriv"
--        readonly property real indicatorHeight: indicators.minimizedPanelHeight + indicatorOrangeLine.height
++        readonly property real indicatorHeight: indicators.minimizedPanelHeight
+     }
      states: [
@@ -234,6 +209,7 @@
              PropertyChanges {
                  target: indicatorArea;
                  anchors.topMargin: 0
++                opacity: 1;
+             }
          },
          State {
@@ -242,6 +218,7 @@
              PropertyChanges {
                  target: indicatorArea;
                  anchors.topMargin: indicators.state === "initial" ? -d.indicatorHeight : 0
++                opacity: indicators.fullyClosed ? 0.0 : 1.0
+             }
              PropertyChanges {
                  target: indicators.showDragHandle;
@@ -249,4 +226,15 @@
+             }
+         }
+     ]
++
++    transitions: [
++        Transition {
++            to: "onscreen"
++            UbuntuNumberAnimation { target: indicatorArea; properties: "anchors.topMargin,opacity" }
++        },
++        Transition {
++            to: "offscreen"
++            UbuntuNumberAnimation { target: indicatorArea; properties: "anchors.topMargin,opacity" }
++        }
++    ]
+ }
 === removed file 'qml/Panel/PanelBackground.qml'
 --- qml/Panel/PanelBackground.qml	2015-07-15 15:07:19 +0000
 +++ qml/Panel/PanelBackground.qml	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
--/*
-- * Copyright (C) 2013 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
--
--Rectangle {
--    color: "black"
--}
 === modified file 'qml/Stages/ApplicationWindow.qml'
 --- qml/Stages/ApplicationWindow.qml	2015-10-26 09:59:50 +0000
 +++ qml/Stages/ApplicationWindow.qml	2015-11-23 13:54:01 +0000
@@ -34,6 +34,8 @@
      property QtObject application
      property int surfaceOrientationAngle
      property alias resizeSurface: sessionContainer.resizeSurface
++    property int requestedWidth: -1
++    property int requestedHeight: -1
      QtObject {
          id: d
@@ -54,7 +56,7 @@
          // Whether the Application had a surface before but lost it.
          property bool hadSurface: sessionContainer.surfaceContainer.hadSurface
--        property bool needToTakeScreenshot:
++        readonly property bool needToTakeScreenshot:
              ((sessionContainer.surface && d.surfaceInitialized) || d.hadSurface)
              && screenshotImage.status === Image.Null
              && d.applicationState === ApplicationInfoInterface.Stopped
@@ -69,7 +71,7 @@
          // Remove this when possible
          property bool surfaceInitialized: false
--        property bool supportsSurfaceResize:
++        readonly property bool supportsSurfaceResize:
                  application &&
                  ((application.supportedOrientations & Qt.PortraitOrientation)
                    || (application.supportedOrientations & Qt.InvertedPortraitOrientation))
@@ -135,7 +137,9 @@
          id: sessionContainer
          // A fake application might not even have a session property.
          session: application && application.session ? application.session : null
--        anchors.fill: parent
++
++        requestedWidth: root.requestedWidth
++        requestedHeight: root.requestedHeight
          surfaceOrientationAngle: application && application.rotatesWindowContents ? root.surfaceOrientationAngle : 0
@@ -150,6 +154,28 @@
          focus: true
+     }
++    // SessionContainer size drives ApplicationWindow size
++    Binding {
++        target: root; property: "width"
++        value: stateGroup.state === "surface" ? sessionContainer.width : root.requestedWidth
++        when: root.requestedWidth >= 0
++    }
++    Binding {
++        target: root; property: "height"
++        value: stateGroup.state === "surface" ? sessionContainer.height : root.requestedHeight
++        when: root.requestedHeight >= 0
++    }
++
++    // ApplicationWindow size drives SessionContainer size
++    Binding {
++        target: sessionContainer; property: "width"; value: root.width
++        when: root.requestedWidth < 0
++    }
++    Binding {
++        target: sessionContainer; property: "height"; value: root.height
++        when: root.requestedHeight < 0
++    }
++
      StateGroup {
          id: stateGroup
          objectName: "applicationWindowStateGroup"
 === modified file 'qml/Stages/DecoratedWindow.qml'
 --- qml/Stages/DecoratedWindow.qml	2015-11-06 13:48:29 +0000
 +++ qml/Stages/DecoratedWindow.qml	2015-11-23 13:54:01 +0000
@@ -23,29 +23,26 @@
  FocusScope {
      id: root
++    width: applicationWindow.width
++    height: (decoration.visible ? decoration.height : 0) + applicationWindow.height
++
      property alias window: applicationWindow
      property alias application: applicationWindow.application
      property alias active: decoration.active
      property alias title: decoration.title
++    property alias fullscreen: applicationWindow.fullscreen
--    property bool decorationShown: true
      property bool highlightShown: false
      property real shadowOpacity: 1
++    property alias requestedWidth: applicationWindow.requestedWidth
++    property real requestedHeight
++
      signal close()
      signal maximize()
      signal minimize()
      signal decorationPressed()
--    BorderImage {
--        anchors {
--            fill: root
--            margins: -units.gu(2)
--        }
--        source: "graphics/dropshadow2gu.sci"
--        opacity: root.shadowOpacity * .3
--    }
--
      Rectangle {
          id: selectionHighlight
          anchors.fill: parent
@@ -58,7 +55,17 @@
          anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
          height: units.dp(2)
          color: UbuntuColors.orange
--        visible: root.highlightShown
++        visible: highlightShown
++    }
++
++    BorderImage {
++        anchors {
++            fill: root
++            margins: active ? -units.gu(2) : -units.gu(1.5)
++        }
++        source: "graphics/dropshadow2gu.sci"
++        opacity: root.shadowOpacity * .3
++        enabled: !fullscreen
+     }
      WindowDecoration {
@@ -68,12 +75,13 @@
          anchors { left: parent.left; top: parent.top; right: parent.right }
          height: units.gu(3)
          width: root.width
--        title: window.title !== "" ? window.title : ""
++        title: window.title
++        visible: !root.fullscreen
++
          onClose: root.close();
--        onMaximize: root.maximize();
++        onMaximize: { root.decorationPressed(); root.maximize(); }
          onMinimize: root.minimize();
          onPressed: root.decorationPressed();
--        visible: decorationShown
+     }
      ApplicationWindow {
@@ -83,7 +91,8 @@
          anchors.topMargin: decoration.height
          anchors.left: parent.left
          width: root.width
--        height: root.height - decoration.height
++        height: fullscreen ? root.height : root.height - decoration.height
++        requestedHeight: root.requestedHeight - (decoration.visible ? decoration.height : 0)
          interactive: true
          focus: true
+     }
 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2015-11-12 20:40:49 +0000
 +++ qml/Stages/DesktopStage.qml	2015-11-23 13:54:01 +0000
@@ -12,12 +12,9 @@
+  *
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors: Michael Zanetti <michael.zanetti@canonical.com>
   */
  import QtQuick 2.4
--import QtQuick.Layouts 1.1
  import Ubuntu.Components 1.3
  import Unity.Application 0.1
  import "../Components/PanelState"
@@ -55,7 +52,7 @@
          onFocusRequested: {
              var appIndex = priv.indexOf(appId);
              var appDelegate = appRepeater.itemAt(appIndex);
--            appDelegate.restoreFromMinimized();
++            appDelegate.restore();
              if (spread.state == "altTab") {
                  spread.cancel();
@@ -107,7 +104,7 @@
          id: minimizeRestoreShortcut
          shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Down
          onTriggered: priv.focusedAppDelegate.maximized || priv.focusedAppDelegate.maximizedLeft || priv.focusedAppDelegate.maximizedRight
--                     ? priv.focusedAppDelegate.restore() : priv.focusedAppDelegate.minimize(true)
++                     ? priv.focusedAppDelegate.restoreFromMaximized() : priv.focusedAppDelegate.minimize()
          active: priv.focusedAppDelegate !== null
+     }
@@ -119,18 +116,16 @@
              var index = indexOf(focusedAppId);
              return index >= 0 && index < appRepeater.count ? appRepeater.itemAt(index) : null
+         }
++        onFocusedAppDelegateChanged: updateForegroundMaximizedApp();
++
          property int foregroundMaximizedAppIdIndex: -1
          function updateForegroundMaximizedApp() {
              for (var i = 0; i < appRepeater.count; i++) {
                  var item = appRepeater.itemAt(i);
--
                  if (item && item.visuallyMaximized) {
--                    var app = ApplicationManager.get(i);
--                    if (app) {
--                        foregroundMaximizedAppIdIndex = i;
--                        return;
--                    }
++                    foregroundMaximizedAppIdIndex = i;
++                    return;
+                 }
+             }
              foregroundMaximizedAppIdIndex = -1;
@@ -149,7 +144,7 @@
              for (var i = 0; i < appRepeater.count; i++) {
                  var appDelegate = appRepeater.itemAt(i);
                  if (appDelegate && !appDelegate.minimized) {
--                    appDelegate.minimize(false); // minimize but don't switch focus
++                    appDelegate.minimize();
+                 }
+             }
@@ -173,24 +168,47 @@
          onClose: {
              ApplicationManager.stopApplication(ApplicationManager.focusedApplicationId)
+         }
--        onMinimize: appRepeater.itemAt(0).minimize(true);
--        onMaximize: appRepeater.itemAt(0).restore();
++        onMinimize: priv.focusedAppDelegate && priv.focusedAppDelegate.minimize();
++        onMaximize: priv.focusedAppDelegate // don't restore minimized apps when double clicking the panel
++                    && priv.focusedAppDelegate.restoreFromMaximized();
++        onFocusMaximizedApp: if (priv.foregroundMaximizedAppIdIndex != -1) {
++                                 ApplicationManager.focusApplication(appRepeater.itemAt(priv.foregroundMaximizedAppIdIndex).appId);
++                             }
+     }
      Binding {
          target: PanelState
          property: "buttonsVisible"
--        value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.maximized
++        value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.maximized // FIXME for Locally integrated menus
++               && spread.state == ""
+     }
      Binding {
          target: PanelState
          property: "title"
--        value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.title
--        when: priv.focusedAppDelegate && priv.focusedAppDelegate.maximized
--    }
--
--    Component.onDestruction: PanelState.buttonsVisible = false;
++        value: {
++            if (priv.focusedAppDelegate !== null && spread.state == "") {
++                if (priv.focusedAppDelegate.maximized)
++                    return priv.focusedAppDelegate.title
++                else
++                    return priv.focusedAppDelegate.appName
++            }
++            return ""
++        }
++        when: priv.focusedAppDelegate
++    }
++
++    Binding {
++        target: PanelState
++        property: "dropShadow"
++        value: priv.focusedAppDelegate && !priv.focusedAppDelegate.maximized && priv.foregroundMaximizedAppIdIndex !== -1
++    }
++
++    Component.onDestruction: {
++        PanelState.title = "";
++        PanelState.buttonsVisible = false;
++        PanelState.dropShadow = false;
++    }
      FocusScope {
          id: appContainer
@@ -211,17 +229,16 @@
              model: ApplicationManager
              objectName: "appRepeater"
--            onItemAdded: priv.updateForegroundMaximizedApp()
--            onItemRemoved: priv.updateForegroundMaximizedApp()
--
              delegate: FocusScope {
                  id: appDelegate
                  objectName: "appDelegate_" + appId
                  z: ApplicationManager.count - index
--                y: units.gu(3)
--                width: units.gu(60)
--                height: units.gu(50)
++                y: PanelState.panelHeight
                  focus: appId === priv.focusedAppId
++                width: decoratedWindow.width
++                height: decoratedWindow.height
++                property alias requestedWidth: decoratedWindow.requestedWidth
++                property alias requestedHeight: decoratedWindow.requestedHeight
                  QtObject {
                      id: appDelegatePrivate
@@ -238,6 +255,7 @@
                  readonly property string appId: model.appId
                  property bool animationsEnabled: true
                  property alias title: decoratedWindow.title
++                readonly property string appName: model.name
                  property bool visuallyMaximized: false
                  property bool visuallyMinimized: false
@@ -247,7 +265,6 @@
+                     }
+                 }
--                onZChanged: priv.updateForegroundMaximizedApp()
                  onVisuallyMaximizedChanged: priv.updateForegroundMaximizedApp()
                  visible: !visuallyMinimized &&
@@ -287,19 +304,18 @@
+                 }
                  function minimize(animated) {
                      animationsEnabled = (animated === undefined) || animated;
--                    appDelegatePrivate.maximized = false;
                      appDelegatePrivate.minimized = true;
+                 }
++                function restoreFromMaximized(animated) {
++                    animationsEnabled = (animated === undefined) || animated;
++                    appDelegatePrivate.minimized = false;
++                    appDelegatePrivate.maximized = false;
++                    appDelegatePrivate.maximizedLeft = false;
++                    appDelegatePrivate.maximizedRight = false;
++                }
                  function restore(animated) {
                      animationsEnabled = (animated === undefined) || animated;
                      appDelegatePrivate.minimized = false;
--                    appDelegatePrivate.maximized = false;
--                    appDelegatePrivate.maximizedLeft = false;
--                    appDelegatePrivate.maximizedRight = false;
--                }
--                function restoreFromMinimized(animated) {
--                    animationsEnabled = (animated === undefined) || animated;
--                    appDelegatePrivate.minimized = false;
                      if (maximized)
                          maximize();
                      else if (maximizedLeft)
@@ -311,6 +327,14 @@
                  states: [
                      State {
++                        name: "fullscreen"; when: decoratedWindow.fullscreen
++                        extend: "maximized"
++                        PropertyChanges {
++                            target: appDelegate;
++                            y: -PanelState.panelHeight
++                        }
++                    },
++                    State {
                          name: "normal";
                          when: !appDelegate.maximized && !appDelegate.minimized
                                && !appDelegate.maximizedLeft && !appDelegate.maximizedRight
@@ -321,22 +345,24 @@
+                         }
                      },
                      State {
--                        name: "maximized"; when: appDelegate.maximized
++                        name: "maximized"; when: appDelegate.maximized && !appDelegate.minimized
                          PropertyChanges {
                              target: appDelegate;
                              x: 0; y: 0;
--                            width: root.width; height: root.height;
++                            requestedWidth: root.width; requestedHeight: root.height;
                              visuallyMinimized: false;
                              visuallyMaximized: true
+                         }
                      },
                      State {
                          name: "maximizedLeft"; when: appDelegate.maximizedLeft && !appDelegate.minimized
--                        PropertyChanges { target: appDelegate; x: 0; y: units.gu(3); width: root.width/2; height: root.height - units.gu(3) }
++                        PropertyChanges { target: appDelegate; x: 0; y: PanelState.panelHeight;
++                            requestedWidth: root.width/2; requestedHeight: root.height - PanelState.panelHeight }
                      },
                      State {
                          name: "maximizedRight"; when: appDelegate.maximizedRight && !appDelegate.minimized
--                        PropertyChanges { target: appDelegate; x: root.width/2; y: units.gu(3); width: root.width/2; height: root.height - units.gu(3) }
++                        PropertyChanges { target: appDelegate; x: root.width/2; y: PanelState.panelHeight;
++                            requestedWidth: root.width/2; requestedHeight: root.height - PanelState.panelHeight }
                      },
                      State {
                          name: "minimized"; when: appDelegate.minimized
@@ -355,32 +381,32 @@
                          to: "normal"
                          enabled: appDelegate.animationsEnabled
                          PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
--                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale"; duration: UbuntuAnimation.FastDuration }
--                    },
--                    Transition {
--                        to: "maximized"
--                        enabled: appDelegate.animationsEnabled
--                        PropertyAction { target: appDelegate; property: "visuallyMinimized" }
--                        SequentialAnimation {
--                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale"; duration: UbuntuAnimation.FastDuration }
--                            PropertyAction { target: appDelegate; property: "visuallyMaximized" }
--                        }
++                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
                      },
                      Transition {
                          to: "minimized"
                          enabled: appDelegate.animationsEnabled
                          PropertyAction { target: appDelegate; property: "visuallyMaximized" }
                          SequentialAnimation {
--                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale"; duration: UbuntuAnimation.FastDuration }
++                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
                              PropertyAction { target: appDelegate; property: "visuallyMinimized" }
                              ScriptAction {
                                  script: {
--                                    if (appDelegate.animationsEnabled && state === "minimized" ) {
++                                    if (appDelegate.minimized) {
                                          priv.focusNext();
+                                     }
+                                 }
+                             }
+                         }
++                    },
++                    Transition {
++                        to: "*" //maximized and fullscreen
++                        enabled: appDelegate.animationsEnabled
++                        PropertyAction { target: appDelegate; property: "visuallyMinimized" }
++                        SequentialAnimation {
++                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
++                            PropertyAction { target: appDelegate; property: "visuallyMaximized" }
++                        }
+                     }
+                 ]
@@ -410,16 +436,14 @@
                      objectName: "decoratedWindow"
                      anchors.left: appDelegate.left
                      anchors.top: appDelegate.top
--                    width: appDelegate.width
--                    height: appDelegate.height
                      application: ApplicationManager.get(index)
                      active: ApplicationManager.focusedApplicationId === model.appId
                      focus: true
                      onClose: ApplicationManager.stopApplication(model.appId)
                      onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
--                                ? appDelegate.restore() : appDelegate.maximize()
--                    onMinimize: appDelegate.minimize(true)
++                                ? appDelegate.restoreFromMaximized() : appDelegate.maximize()
++                    onMinimize: appDelegate.minimize()
                      onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }
+                 }
+             }
 === modified file 'qml/Stages/SessionContainer.qml'
 --- qml/Stages/SessionContainer.qml	2015-09-29 12:28:10 +0000
 +++ qml/Stages/SessionContainer.qml	2015-11-23 13:54:01 +0000
@@ -29,13 +29,37 @@
      property alias surfaceOrientationAngle: _surfaceContainer.surfaceOrientationAngle
      property alias resizeSurface: _surfaceContainer.resizeSurface
++    property int requestedWidth: -1
++    property int requestedHeight: -1
++
      readonly property alias surfaceContainer: _surfaceContainer
      SurfaceContainer {
          id: _surfaceContainer
--        anchors.fill: parent
++        requestedWidth: root.requestedWidth
++        requestedHeight: root.requestedHeight
          surface: session ? session.surface : null
+     }
++    // SurfaceContainer size drives SessionContainer size
++    Binding {
++        target: root; property: "width"; value: _surfaceContainer.width
++        when: root.requestedWidth >= 0
++    }
++    Binding {
++        target: root; property: "height"; value: _surfaceContainer.height
++        when: root.requestedHeight >= 0
++    }
++
++    // SessionContainer size drives SurfaceContainer size
++    Binding {
++        target: _surfaceContainer; property: "width"; value: root.width
++        when: root.requestedWidth < 0
++    }
++    Binding {
++        target: _surfaceContainer; property: "height"; value: root.height
++        when: root.requestedHeight < 0
++    }
++
      Repeater {
          id: childSessionsRepeater
          model: root.childSessions
 === modified file 'qml/Stages/SurfaceContainer.qml'
 --- qml/Stages/SurfaceContainer.qml	2015-10-26 09:59:50 +0000
 +++ qml/Stages/SurfaceContainer.qml	2015-11-23 13:54:01 +0000
@@ -31,6 +31,9 @@
      property string name: surface ? surface.name : ""
      property bool resizeSurface: true
++    property int requestedWidth: -1
++    property int requestedHeight: -1
++
      onSurfaceChanged: {
          if (surface) {
              surfaceItem.surface = surface;
@@ -54,16 +57,65 @@
          consumesInput: true
--        surfaceWidth: root.resizeSurface ? width : -1
--        surfaceHeight: root.resizeSurface ? height : -1
--
--        anchors.fill: root
++        surfaceWidth: {
++            if (root.resizeSurface) {
++                if (root.requestedWidth >= 0) {
++                    return root.requestedWidth;
++                } else {
++                    return width;
++                }
++            } else {
++                return -1;
++            }
++        }
++
++        surfaceHeight: {
++            if (root.resizeSurface) {
++                if (root.requestedHeight >= 0) {
++                    return root.requestedHeight;
++                } else {
++                    return height;
++                }
++            } else {
++                return -1;
++            }
++        }
++
          enabled: root.interactive
          focus: true
          antialiasing: !root.interactive
          orientationAngle: root.surfaceOrientationAngle
+     }
++    // MirSurface size drives SurfaceContainer size
++    Binding {
++        target: surfaceItem; property: "width"; value: root.surface ? root.surface.size.width : 0
++        when: root.requestedWidth >= 0 && root.surface
++    }
++    Binding {
++        target: surfaceItem; property: "height"; value: root.surface ? root.surface.size.height : 0
++        when: root.requestedHeight >= 0 && root.surface
++    }
++    Binding {
++        target: root; property: "width"; value: surfaceItem.width
++        when: root.requestedWidth >= 0
++    }
++    Binding {
++        target: root; property: "height"; value: surfaceItem.height
++        when: root.requestedHeight >= 0
++    }
++
++    // SurfaceContainer size drives MirSurface size
++    Binding {
++        target: surfaceItem; property: "width"; value: root.width
++        when: root.requestedWidth < 0
++    }
++    Binding {
++        target: surfaceItem; property: "height"; value: root.height
++        when: root.requestedHeight < 0
++    }
++
++
      TouchGate {
          targetItem: surfaceItem
          anchors.fill: root
 === modified file 'qml/Stages/WindowDecoration.qml'
 --- qml/Stages/WindowDecoration.qml	2015-11-09 10:16:18 +0000
 +++ qml/Stages/WindowDecoration.qml	2015-11-23 13:54:01 +0000
@@ -33,6 +33,8 @@
      signal minimize()
      signal maximize()
++    onDoubleClicked: root.maximize()
++
      QtObject {
          id: priv
          property real distanceX
@@ -65,20 +67,23 @@
          anchors.fill: parent
          anchors.bottomMargin: -radius
          radius: units.gu(.5)
--        gradient: Gradient {
--            GradientStop { color: "#626055"; position: 0 }
--            GradientStop { color: "#3C3B37"; position: 1 }
--        }
++        color: "#333333"
+     }
      Row {
--        anchors { fill: parent; margins: units.gu(0.7) }
--        spacing: units.gu(1)
--        opacity: root.active ? 1 : 0.5
++        anchors {
++            fill: parent
++            leftMargin: units.gu(1)
++            rightMargin: units.gu(1)
++            topMargin: units.gu(0.5)
++            bottomMargin: units.gu(0.5)
++        }
++        spacing: units.gu(3)
          WindowControlButtons {
              id: buttons
              height: parent.height
++            active: root.active
              onClose: root.close();
              onMinimize: root.minimize();
              onMaximize: root.maximize();
@@ -87,12 +92,12 @@
          Label {
              id: titleLabel
              objectName: "windowDecorationTitle"
--            color: "#DFDBD2"
++            color: root.active ? "white" : "#5d5d5d"
              height: parent.height
              width: parent.width - buttons.width - parent.anchors.rightMargin - parent.anchors.leftMargin
              verticalAlignment: Text.AlignVCenter
--            fontSize: "small"
--            font.bold: true
++            fontSize: "medium"
++            font.weight: root.active ? Font.Light : Font.Normal
              elide: Text.ElideRight
+         }
+     }
 === modified file 'qml/Stages/WindowResizeArea.qml'
 --- qml/Stages/WindowResizeArea.qml	2015-11-09 10:52:53 +0000
 +++ qml/Stages/WindowResizeArea.qml	2015-11-23 13:54:01 +0000
@@ -25,7 +25,7 @@
      anchors.fill: target
      anchors.margins: -borderThickness
--    hoverEnabled: true
++    hoverEnabled: target && !target.maximized // don't grab the resize under the panel
      property var windowStateStorage: WindowStateStorage
@@ -36,6 +36,8 @@
      property int borderThickness: 0
      property int minWidth: 0
      property int minHeight: 0
++    property int defaultWidth: units.gu(60)
++    property int defaultHeight: units.gu(50)
      property int screenWidth: 0
      property int screenHeight: 0
@@ -67,13 +69,14 @@
+     }
      Component.onCompleted: {
--        var windowGeometry = windowStateStorage.getGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
--        if (windowGeometry !== undefined) {
--            target.width = Math.min(windowGeometry.width, root.screenWidth)
--            target.height = Math.min(windowGeometry.height, root.screenHeight - PanelState.panelHeight)
--            target.x = Math.max(Math.min(windowGeometry.x, root.screenWidth - target.width), 0)
--            target.y = Math.max(Math.min(windowGeometry.y, root.screenHeight - target.height), PanelState.panelHeight)
--        }
++        var windowGeometry = windowStateStorage.getGeometry(root.windowId,
++                                                            Qt.rect(target.x, target.y, defaultWidth, defaultHeight));
++
++        target.requestedWidth = Math.min(Math.max(windowGeometry.width, minWidth), screenWidth);
++        target.requestedHeight = Math.min(Math.max(windowGeometry.height, minHeight), root.screenHeight - PanelState.panelHeight);
++        target.x = Math.max(Math.min(windowGeometry.x, root.screenWidth - target.requestedWidth), 0)
++        target.y = Math.max(Math.min(windowGeometry.y, root.screenHeight - target.requestedHeight), PanelState.panelHeight)
++
          var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)
          if (windowState === WindowStateStorage.WindowStateMaximized) {
              target.maximize(false)
@@ -93,6 +96,18 @@
          property bool topBorder: false
          property bool bottomBorder: false
++        // true  - A change in surface size will cause the left border of the window to move accordingly.
++        //         The window's right border will stay in the same position.
++        // false - a change in surface size will cause the right border of the window to move accordingly.
++        //         The window's left border will stay in the same position.
++        property bool moveLeftBorder: false
++
++        // true  - A change in surface size will cause the top border of the window to move accordingly.
++        //         The window's bottom border will stay in the same position.
++        // false - a change in surface size will cause the bottom border of the window to move accordingly.
++        //         The window's top border will stay in the same position.
++        property bool moveTopBorder: false
++
          property bool dragging: false
          property real startMousePosX
          property real startMousePosY
@@ -100,6 +115,8 @@
          property real startY
          property real startWidth
          property real startHeight
++        property real currentWidth
++        property real currentHeight
          property string cursorName: {
              if (root.containsMouse || root.pressed) {
@@ -138,11 +155,24 @@
+         }
+     }
++    Timer {
++        id: resetBordersToMoveTimer
++        interval: 2000
++        onTriggered: {
++            d.moveLeftBorder = false;
++            d.moveTopBorder = false;
++        }
++    }
++
      onPressedChanged: {
          var pos = mapToItem(target.parent, mouseX, mouseY);
          if (pressed) {
              d.updateBorders();
++            resetBordersToMoveTimer.stop();
++            d.moveLeftBorder = d.leftBorder;
++            d.moveTopBorder = d.topBorder;
++
              var pos = mapToItem(root.target.parent, mouseX, mouseY);
              d.startMousePosX = pos.x;
              d.startMousePosY = pos.y;
@@ -150,8 +180,11 @@
              d.startY = target.y;
              d.startWidth = target.width;
              d.startHeight = target.height;
++            d.currentWidth = target.width;
++            d.currentHeight = target.height;
              d.dragging = true;
          } else {
++            resetBordersToMoveTimer.start();
              d.dragging = false;
              if (containsMouse) {
                  d.updateBorders();
@@ -182,37 +215,49 @@
          if (d.leftBorder) {
              var newTargetX = d.startX + deltaX;
              if (target.x + target.width > newTargetX + minWidth) {
--                target.width = target.x + target.width - newTargetX;
--                target.x = newTargetX;
++                target.requestedWidth = target.x + target.width - newTargetX;
              } else {
--                target.x = target.x + target.width - minWidth;
--                target.width = minWidth;
++                target.requestedWidth = minWidth;
+             }
          } else if (d.rightBorder) {
              if (d.startWidth + deltaX >= minWidth) {
--                target.width = d.startWidth + deltaX;
++                target.requestedWidth = d.startWidth + deltaX;
              } else {
--                target.width = minWidth;
++                target.requestedWidth = minWidth;
+             }
+         }
          if (d.topBorder) {
              var newTargetY = d.startY + deltaY;
              if (target.y + target.height > newTargetY + minHeight) {
--                target.height = target.y + target.height - newTargetY;
--                target.y = newTargetY;
++                target.requestedHeight = target.y + target.height - newTargetY;
              } else {
--                target.y = target.y + target.height - minHeight;
--                target.height = minHeight;
++                target.requestedHeight = minHeight;
+             }
          } else if (d.bottomBorder) {
              if (d.startHeight + deltaY >= minHeight) {
--                target.height = d.startHeight + deltaY;
++                target.requestedHeight = d.startHeight + deltaY;
              } else {
--                target.height = minHeight;
--            }
++                target.requestedHeight = minHeight;
++            }
++        }
++    }
++
++    Connections {
++        target: root.target
++        onWidthChanged: {
++            if (d.moveLeftBorder) {
++                target.x += d.currentWidth - target.width;
++            }
++            d.currentWidth = target.width;
++        }
++        onHeightChanged: {
++            if (d.moveTopBorder) {
++                target.y += d.currentHeight - target.height;
++            }
++            d.currentHeight = target.height;
+         }
+     }
+ }
 === modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
 --- tests/mocks/Unity/Application/MirSurface.cpp	2015-10-27 21:55:10 +0000
 +++ tests/mocks/Unity/Application/MirSurface.cpp	2015-11-23 13:54:01 +0000
@@ -35,8 +35,12 @@
      , m_activeFocus(false)
      , m_width(-1)
      , m_height(-1)
++    , m_slowToResize(false)
+ {
  //    qDebug() << "MirSurface::MirSurface() " << name;
++    m_delayedResizeTimer.setInterval(600);
++    m_delayedResizeTimer.setSingleShot(true);
++    connect(&m_delayedResizeTimer, &QTimer::timeout, this, &MirSurface::applyDelayedResize);
+ }
  MirSurface::~MirSurface()
@@ -197,7 +201,38 @@
  void MirSurface::resize(int width, int height)
+ {
++    if (m_slowToResize) {
++        if (!m_delayedResizeTimer.isActive()) {
++            m_delayedResize.setWidth(width);
++            m_delayedResize.setHeight(height);
++            m_delayedResizeTimer.start();
++        } else {
++            m_pendingResize.setWidth(width);
++            m_pendingResize.setHeight(height);
++        }
++    } else {
++        doResize(width, height);
++    }
++}
++
++void MirSurface::applyDelayedResize()
++{
++    doResize(m_delayedResize.width(), m_delayedResize.height());
++    m_delayedResize.setWidth(-1);
++    m_delayedResize.setHeight(-1);
++
++    if (m_pendingResize.isValid()) {
++        QSize size = m_pendingResize;
++        m_pendingResize.setWidth(-1);
++        m_pendingResize.setHeight(-1);
++        resize(size.width(), size.height());
++    }
++}
++
++void MirSurface::doResize(int width, int height)
++{
      bool changed = false;
++
      if (width != m_width) {
          m_width = width;
          Q_EMIT widthChanged();
@@ -214,3 +249,20 @@
          Q_EMIT sizeChanged(QSize(width, height));
+     }
+ }
++
++bool MirSurface::isSlowToResize() const
++{
++    return m_slowToResize;
++}
++
++void MirSurface::setSlowToResize(bool value)
++{
++    if (m_slowToResize != value) {
++        m_slowToResize = value;
++        Q_EMIT slowToResizeChanged();
++        if (!m_slowToResize && m_delayedResizeTimer.isActive()) {
++            m_delayedResizeTimer.stop();
++            applyDelayedResize();
++        }
++    }
++}
 === modified file 'tests/mocks/Unity/Application/MirSurface.h'
 --- tests/mocks/Unity/Application/MirSurface.h	2015-10-20 16:48:06 +0000
 +++ tests/mocks/Unity/Application/MirSurface.h	2015-11-23 13:54:01 +0000
@@ -18,6 +18,7 @@
  #define MOCK_MIR_SURFACE_H
  #include <QObject>
++#include <QTimer>
  #include <QUrl>
  #include <QHash>
@@ -33,6 +34,7 @@
      Q_PROPERTY(int width READ width NOTIFY widthChanged)
      Q_PROPERTY(int height READ height NOTIFY heightChanged)
      Q_PROPERTY(bool activeFocus READ activeFocus NOTIFY activeFocusChanged)
++    Q_PROPERTY(bool slowToResize READ isSlowToResize WRITE setSlowToResize NOTIFY slowToResizeChanged)
  public:
      MirSurface(const QString& name,
@@ -77,6 +79,9 @@
      int width() const;
      int height() const;
++    bool isSlowToResize() const;
++    void setSlowToResize(bool value);
++
      /////
      // internal mock stuff
@@ -94,13 +99,18 @@
      void orientationAngleChanged(Mir::OrientationAngle angle);
      void widthChanged();
      void heightChanged();
++    void slowToResizeChanged();
      ////
      // internal mock stuff
      void screenshotUrlChanged(QUrl);
      void activeFocusChanged(bool);
++private Q_SLOTS:
++    void applyDelayedResize();
++
  private:
++    void doResize(int width, int height);
      void updateVisibility();
      const QString m_name;
@@ -114,6 +124,12 @@
      bool m_activeFocus;
      int m_width;
      int m_height;
++
++    bool m_slowToResize;
++    QTimer m_delayedResizeTimer;
++    QSize m_delayedResize;
++    QSize m_pendingResize;
++
      struct View {
          bool visible;
      };
 === modified file 'tests/qmltests/Panel/tst_Panel.qml'
 --- tests/qmltests/Panel/tst_Panel.qml	2015-08-03 13:48:14 +0000
 +++ tests/qmltests/Panel/tst_Panel.qml	2015-11-23 13:54:01 +0000
@@ -23,6 +23,7 @@
  import Unity.Indicators 0.1 as Indicators
  import Ubuntu.Telephony 0.1 as Telephony
  import "../../../qml/Panel"
++import "../../../qml/Components/PanelState"
  IndicatorTest {
      id: root
@@ -30,6 +31,12 @@
      height: units.gu(71)
      color: "white"
++    Binding {
++        target: mouseEmulation
++        property: "checked"
++        value: !windowControlsCB.checked
++    }
++
      RowLayout {
          anchors.fill: parent
          anchors.margins: units.gu(1)
@@ -45,17 +52,18 @@
              MouseArea {
                  id: backgroundMouseArea
                  anchors.fill: parent
--            }
--
--            Panel {
--                id: panel
--                anchors.fill: parent
--                indicators {
--                    width: parent.width > units.gu(60) ? units.gu(40) : parent.width
--                    indicatorsModel: root.indicatorsModel
++                hoverEnabled: true
++
++                Panel {
++                    id: panel
++                    anchors.fill: parent
++                    indicators {
++                        width: parent.width > units.gu(60) ? units.gu(40) : parent.width
++                        indicatorsModel: root.indicatorsModel
++                    }
++
++                    property real panelAndSeparatorHeight: panel.indicators.minimizedPanelHeight
+                 }
--
--                property real panelAndSeparatorHeight: panel.indicators.minimizedPanelHeight + units.dp(2)
+             }
+         }
@@ -93,6 +101,32 @@
+                 }
+             }
++            RowLayout {
++                Layout.fillWidth: true
++                CheckBox {
++                    id: windowControlsCB
++                    onClicked: PanelState.buttonsVisible = checked
++                }
++                Label {
++                    text: "Show window controls"
++                }
++            }
++
++            RowLayout {
++                Layout.fillWidth: true
++                CheckBox {
++                    onClicked: {
++                        if (checked)
++                            PanelState.title = "Fake window title"
++                        else
++                            PanelState.title = ""
++                    }
++                }
++                Label {
++                    text: "Show fake window title"
++                }
++            }
++
              Rectangle {
                  Layout.preferredHeight: units.dp(1);
                  Layout.fillWidth: true;
@@ -127,7 +161,7 @@
                  color: "black"
+             }
--            MouseTouchEmulationCheckbox {}
++            MouseTouchEmulationCheckbox { id: mouseEmulation }
+         }
+     }
 === modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
 --- tests/qmltests/Stages/tst_DesktopStage.qml	2015-11-06 13:48:29 +0000
 +++ tests/qmltests/Stages/tst_DesktopStage.qml	2015-11-23 13:54:01 +0000
@@ -17,7 +17,7 @@
  import QtQuick 2.4
  import QtTest 1.0
  import Ubuntu.Components 1.3
--import Ubuntu.Components.ListItems 1.3 as ListItem
++import Ubuntu.Components.ListItems 1.3
  import Unity.Application 0.1
  import Unity.Test 0.1
  import Utils 0.1
@@ -46,8 +46,8 @@
          WindowStateStorage.geometry = {
              'unity8-dash': Qt.rect(0, units.gu(3), units.gu(50), units.gu(40)),
              'dialer-app': Qt.rect(units.gu(51), units.gu(3), units.gu(50), units.gu(40)),
--            'camera-app': Qt.rect(0, units.gu(44), units.gu(50), units.gu(40)),
--            'gallery-app': Qt.rect(units.gu(51), units.gu(44), units.gu(50), units.gu(40))
++            'gmail-webapp': Qt.rect(0, units.gu(44), units.gu(50), units.gu(40)),
++            'twitter-webapp': Qt.rect(units.gu(51), units.gu(44), units.gu(50), units.gu(40))
+         }
+     }
@@ -60,10 +60,14 @@
          focus: true
++        property bool itemDestroyed: false
          sourceComponent: Component {
              DesktopStage {
                  color: "darkblue"
                  anchors.fill: parent
++                Component.onDestruction: {
++                    desktopStageLoader.itemDestroyed = true;
++                }
                  orientations: Orientations {}
+             }
+         }
@@ -82,6 +86,21 @@
          Column {
              anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
              spacing: units.gu(1)
++
++            Button {
++                color: "white"
++                text: "Make surface slow to resize"
++                activeFocusOnPress: false
++                onClicked: {
++                    if (ApplicationManager.focusedApplicationId) {
++                        var surface = ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).session.surface;
++                        surface.slowToResize = true;
++                    }
++                }
++            }
++
++            Divider {}
++
              Repeater {
                  model: ApplicationManager.availableApplications
                  ApplicationCheckBox {
@@ -99,10 +118,16 @@
          property Item desktopStage: desktopStageLoader.status === Loader.Ready ? desktopStageLoader.item : null
          function cleanup() {
++            desktopStageLoader.itemDestroyed = false;
              desktopStageLoader.active = false;
              tryCompare(desktopStageLoader, "status", Loader.Null);
              tryCompare(desktopStageLoader, "item", null);
++            // Loader.status might be Loader.Null and Loader.item might be null but the Loader
++            // actually took place. Likely because Loader waits until the next event loop
++            // iteration to do its work. So to ensure the reload, we will wait until the
++            // Shell instance gets destroyed.
++            tryCompare(desktopStageLoader, "itemDestroyed", true);
              killAllRunningApps();
@@ -156,8 +181,8 @@
          function test_tappingOnWindowChangesFocusedApp_data() {
              return [
--                {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 0, focusTo: 1 },
--                {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 1, focusTo: 0 },
++                {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app", "gmail-webapp"], focusfrom: 0, focusTo: 1 },
++                {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app", "gmail-webapp"], focusfrom: 1, focusTo: 0 }
+             ]
+         }
@@ -203,8 +228,8 @@
          function test_tappingOnDecorationFocusesApplication_data() {
              return [
--                {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 0, focusTo: 1 },
--                {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 1, focusTo: 0 },
++                {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app", "gmail-webapp"], focusfrom: 0, focusTo: 1 },
++                {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app", "gmail-webapp"], focusfrom: 1, focusTo: 0 }
+             ]
+         }
@@ -214,12 +239,16 @@
              var fromAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusfrom]);
              verify(fromAppDecoration);
              tap(fromAppDecoration);
--            tryCompare(ApplicationManager.findApplication(data.apps[data.focusfrom]).session.surface, "activeFocus", true);
++            var fromApp = ApplicationManager.findApplication(data.apps[data.focusfrom]);
++            verify(fromApp);
++            tryCompare(fromApp.session.surface, "activeFocus", true);
              var toAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusTo]);
              verify(toAppDecoration);
              tap(toAppDecoration);
--            tryCompare(ApplicationManager.findApplication(data.apps[data.focusTo]).session.surface, "activeFocus", true);
++            var toApp = ApplicationManager.findApplication(data.apps[data.focusTo]);
++            verify(toApp);
++            tryCompare(toApp.session.surface, "activeFocus", true);
+         }
          function test_clickingOnDecorationFocusesApplication_data() {
@@ -339,26 +368,26 @@
          function test_maximizeApplicationHidesSurfacesBehindIt() {
              var dashApp = startApplication("unity8-dash");
              var dialerApp = startApplication("dialer-app");
--            var cameraApp = startApplication("camera-app");
++            var gmailApp = startApplication("gmail-webapp");
              var dashDelegate = findChild(desktopStage, "appDelegate_unity8-dash");
              verify(dashDelegate);
              var dialerDelegate = findChild(desktopStage, "appDelegate_dialer-app");
              verify(dialerDelegate);
--            var cameraDelegate = findChild(desktopStage, "appDelegate_camera-app");
--            verify(cameraDelegate);
++            var gmailDelegate = findChild(desktopStage, "appDelegate_gmail-webapp");
++            verify(gmailDelegate);
              // maximize
--            findChild(dialerDelegate, "decoratedWindow").maximize();
++            dialerDelegate.maximize();
              tryCompare(dialerDelegate, "visuallyMaximized", true);
              tryCompare(dashApp.session.surface, "visible", false);
--            compare(cameraApp.session.surface.visible, true);
++            compare(gmailApp.session.surface.visible, true);
              // restore
--            findChild(dialerDelegate, "decoratedWindow").maximize();
++            dialerDelegate.restoreFromMaximized();
              compare(dashApp.session.surface.visible, true);
--            compare(cameraApp.session.surface.visible, true);
++            compare(gmailApp.session.surface.visible, true);
+         }
          function test_applicationsBecomeVisibleWhenOccludingAppRemoved() {
@@ -370,28 +399,52 @@
              var dialerDelegate = findChild(desktopStage, "appDelegate_dialer-app");
              verify(dialerDelegate);
--            var cameraApp = startApplication("camera-app");
--            var cameraDelegate = findChild(desktopStage, "appDelegate_camera-app");
--            verify(cameraDelegate);
--            findChild(dialerDelegate, "decoratedWindow").maximize();
--
--            var galleryApp = startApplication("gallery-app");
--            var galleryDelegate = findChild(desktopStage, "appDelegate_gallery-app");
--            verify(galleryDelegate);
--            findChild(galleryDelegate, "decoratedWindow").maximize();
++            var dialerMaximizeButton = findChild(dialerDelegate, "maximizeWindowButton");
++            verify(dialerMaximizeButton);
++            mouseClick(dialerMaximizeButton);
++
++            var mapApp = startApplication("map");
++            var mapDelegate = findChild(desktopStage, "appDelegate_map");
++            verify(mapDelegate);
++
++            var gmailApp = startApplication("gmail-webapp");
++            var gmailDelegate = findChild(desktopStage, "appDelegate_gmail-webapp");
++            verify(gmailDelegate);
++
++            var gmailMaximizeButton = findChild(gmailDelegate, "maximizeWindowButton");
++            verify(gmailMaximizeButton);
++            mouseClick(gmailMaximizeButton);
              tryCompare(dialerDelegate, "visuallyMaximized", true);
--            tryCompare(galleryDelegate, "visuallyMaximized", true);
++            tryCompare(gmailDelegate, "visuallyMaximized", true);
              tryCompare(dashApp.session.surface, "visible", false);
              tryCompare(dialerApp.session.surface, "visible", false);
--            tryCompare(cameraApp.session.surface, "visible", false);
--
--            ApplicationManager.stopApplication("gallery-app");
--
--            compare(cameraApp.session.surface.visible, true);
++            tryCompare(mapApp.session.surface, "visible", false);
++
++            ApplicationManager.stopApplication("gmail-webapp");
++
++            compare(mapApp.session.surface.visible, true);
              tryCompare(dialerApp.session.surface, "visible", true);
              tryCompare(dashApp.session.surface, "visible", false); // still occluded by maximised dialer
+         }
++
++        function test_maximisedAppStaysVisibleWhenAppStarts() {
++            var dashApp = startApplication("unity8-dash");
++            var dashDelegate = findChild(desktopStage, "appDelegate_unity8-dash");
++            verify(dashDelegate);
++            // maximize
++            var dashMaximizeButton = findChild(dashDelegate, "maximizeWindowButton");
++            verify(dashMaximizeButton);
++            mouseClick(dashMaximizeButton);
++            tryCompare(dashDelegate, "visuallyMaximized", true);
++
++            var dialerApp = startApplication("dialer-app");
++            var dialerDelegate = findChild(desktopStage, "appDelegate_dialer-app");
++            verify(dialerDelegate);
++
++            compare(dialerDelegate.visible, true, "Dialer should be visible");
++            compare(dashDelegate.visible, true, "Dash should still be visible");
++        }
+     }
+ }
 === modified file 'tests/qmltests/Stages/tst_WindowResizeArea.qml'
 --- tests/qmltests/Stages/tst_WindowResizeArea.qml	2015-11-09 10:16:18 +0000
 +++ tests/qmltests/Stages/tst_WindowResizeArea.qml	2015-11-23 13:54:01 +0000
@@ -30,8 +30,6 @@
      height: units.gu(60)
      width: units.gu(60)
--    property var fakeWindow: windowLoader.item
--
      Binding {
          target: PanelState
          property: "panelHeight"
@@ -47,10 +45,10 @@
              property alias minHeight: windowResizeArea.minHeight
              x: units.gu(20)
              y: units.gu(20)
--            height: units.gu(20)
--            width: units.gu(20)
--            property int windowHeight: height
--            property int windowWidth: width
++            width: requestedWidth
++            height: requestedHeight
++            property real requestedWidth
++            property real requestedHeight
              state: "normal"
              function maximize() {
@@ -63,6 +61,8 @@
                  borderThickness: units.gu(2)
                  minWidth: units.gu(15)
                  minHeight: units.gu(10)
++                defaultWidth: units.gu(20)
++                defaultHeight: units.gu(20)
                  windowId: "test-window-id"
                  screenWidth: root.width
                  screenHeight: root.height
@@ -87,22 +87,41 @@
      Loader {
          id: windowLoader
          sourceComponent: fakeWindowComponent
++        active: windowLoaderCheckbox.checked
+     }
--    MouseTouchEmulationCheckbox {
--        checked: false
--        color: "black"
++    Column {
++        MouseTouchEmulationCheckbox {
++            checked: false
++            color: "black"
++        }
++        RowLayout {
++            Layout.fillWidth: true
++            CheckBox {
++                id: windowLoaderCheckbox
++                checked: true
++                activeFocusOnPress: false
++            }
++            Label {
++                id: label
++                color: "black"
++                text: "Window loader active"
++                anchors.verticalCenter: parent.verticalCenter
++            }
++        }
+     }
      UnityTestCase {
          name: "WindowResizeArea"
          when: windowShown
++        property var fakeWindow: windowLoader.item
++
          function init() {
              fakeWindow.x = units.gu(20)
              fakeWindow.y = units.gu(20)
--            fakeWindow.width = units.gu(20)
--            fakeWindow.height = units.gu(20)
++            fakeWindow.requestedWidth = units.gu(20)
++            fakeWindow.requestedHeight = units.gu(20)
+         }
          function test_resizeWindowRightBottom_data() {
@@ -188,7 +207,7 @@
          function test_resizeSmallerAndLarger_data() {
              return [
                  { tag: "topLeft", startX: -1, startY: -1, dx: units.gu(15), dy: units.gu(15) },
--                { tag: "bottomRight", startX: fakeWindow.width + 1, startY: fakeWindow.height + 1, dx: -units.gu(15), dy: -units.gu(15) }
++                { tag: "bottomRight", startX: units.gu(20) + 1, startY: units.gu(20) + 1, dx: -units.gu(15), dy: -units.gu(15) }
+             ]
+         }
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2015-11-12 20:40:49 +0000
 +++ tests/qmltests/tst_Shell.qml	2015-11-23 13:54:01 +0000
@@ -1777,15 +1777,10 @@
              tryCompare(panelButtons, "visible", false);
              appDelegate.maximize(false);
--            tryCompare(panelButtons, "visible", true);
              shell.usageScenario = "phone";
              waitForRendering(shell);
              tryCompare(panelButtons, "visible", false);
--
--            shell.usageScenario = "desktop";
--            waitForRendering(shell);
--            tryCompare(panelButtons, "visible", true);
+         }
          function test_lockingGreeterHidesPanelButtons() {
@@ -1799,15 +1794,10 @@
              tryCompare(panelButtons, "visible", false);
              appDelegate.maximize(false);
--            tryCompare(panelButtons, "visible", true);
              LightDM.Greeter.showGreeter();
              waitForRendering(shell);
              tryCompare(panelButtons, "visible", false);
--
--            LightDM.Greeter.hideGreeter();
--            waitForRendering(shell);
--            tryCompare(panelButtons, "visible", true);
+         }
          function test_cantMoveWindowUnderPanel() {