Merge lp://qastaging/~mzanetti/unity8/panel-button-fixes into lp://qastaging/unity8

Proposed by Michael Zanetti
Status: Merged
Approved by: Lukáš Tinkl
Approved revision: 1993
Merged at revision: 2029
Proposed branch: lp://qastaging/~mzanetti/unity8/panel-button-fixes
Merge into: lp://qastaging/unity8
Prerequisite: lp://qastaging/~unity-team/unity8/mousePointer
Diff against target: 595 lines (+287/-40)
11 files modified
plugins/Utils/windowstatestorage.cpp (+62/-23)
plugins/Utils/windowstatestorage.h (+13/-1)
qml/Components/WindowControlButtons.qml (+3/-0)
qml/Panel/Panel.qml (+5/-3)
qml/Shell.qml (+2/-0)
qml/Stages/DesktopStage.qml (+10/-3)
qml/Stages/WindowResizeArea.qml (+41/-8)
tests/mocks/Utils/windowstatestorage.cpp (+17/-0)
tests/mocks/Utils/windowstatestorage.h (+12/-0)
tests/qmltests/Stages/tst_WindowResizeArea.qml (+35/-2)
tests/qmltests/tst_Shell.qml (+87/-0)
To merge this branch: bzr merge lp://qastaging/~mzanetti/unity8/panel-button-fixes
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Lukáš Tinkl (community) Approve
Michał Sawicz Pending
Review via email: mp+273838@code.qastaging.launchpad.net

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

Commit message

Fixes for the panel buttons

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

Description of the change

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

no

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

yes

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

yes

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

n/a

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

n/a

To post a comment you must log in.
Revision history for this message
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal

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

Revision history for this message
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal

ok, will redo it on top of that

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1982
http://jenkins.qa.ubuntu.com/job/unity8-ci/6352/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4365
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/727
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1064
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/382
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/959
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/960
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/591
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3557
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4362
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4362/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23682
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/438
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/727
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/727/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23681

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal

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

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

Revision history for this message
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal

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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing
Revision history for this message
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal

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

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

Revision history for this message
Michał Sawicz (saviq) : Posted in a previous version of this proposal
review: Abstain
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal

Text conflict in CMakeLists.txt
1 conflicts encountered.

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote : Posted in a previous version of this proposal

Some inline comments

review: Needs Fixing
1989. By Michael Zanetti

fix some review notes

Revision history for this message
Michael Zanetti (mzanetti) wrote :

> Some inline comments

fixed

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Just for the record:

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

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

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1990. By Michael Zanetti

fix default arg handling

Revision history for this message
Michael Zanetti (mzanetti) wrote :

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

oops. fixed, thanks!

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1991. By Michael Zanetti

merge with prereq

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

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

review: Needs Fixing
1992. By Michael Zanetti

make sure panel buttons are not visible while greeter is shown

1993. By Michael Zanetti

drop debug print

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

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

Yes, works fine

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

Nope, unity-api mismatch probably

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

Yes

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1994. By Michael Zanetti

merge trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1995. By Michael Zanetti

fix tests (clear the mock state store between tests)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1996. By Michael Zanetti

fix initialisation of window storage state for new apps/windows

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1996
http://jenkins.qa.ubuntu.com/job/unity8-ci/6618/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4964
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/33/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3987
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4961
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4961/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24785
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-mako/22/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/33
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24784

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches