Merge lp://qastaging/~dandrader/unity8/availableDesktopArea into lp://qastaging/unity8
- availableDesktopArea
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Michael Zanetti |
Approved revision: | 2893 |
Merged at revision: | 2906 |
Proposed branch: | lp://qastaging/~dandrader/unity8/availableDesktopArea |
Merge into: | lp://qastaging/unity8 |
Prerequisite: | lp://qastaging/~dandrader/unity8/satelliteWindow |
Diff against target: |
824 lines (+338/-57) 14 files modified
plugins/WindowManager/AvailableDesktopArea.cpp (+50/-0) plugins/WindowManager/AvailableDesktopArea.h (+38/-0) plugins/WindowManager/CMakeLists.txt (+7/-0) plugins/WindowManager/WindowManagerPlugin.cpp (+5/-1) plugins/WindowManager/WindowMargins.cpp (+74/-0) plugins/WindowManager/WindowMargins.h (+59/-0) qml/Shell.qml (+8/-1) qml/Stage/ChildWindow.qml (+8/-1) qml/Stage/ChildWindowTree.qml (+1/-0) qml/Stage/DecoratedWindow.qml (+14/-7) qml/Stage/Stage.qml (+57/-47) tests/qmltests/Stage/tst_DesktopStage.qml (+7/-0) tests/qmltests/Stage/tst_PhoneStage.qml (+5/-0) tests/qmltests/Stage/tst_TabletStage.qml (+5/-0) |
To merge this branch: | bzr merge lp://qastaging/~dandrader/unity8/availableDesktopArea |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot | continuous-integration | Approve | |
Michael Zanetti (community) | Approve | ||
Albert Astals Cid (community) | Abstain | ||
Review via email:
|
This proposal supersedes a proposal from 2017-03-13.
Commit message
Tell qtmir/miral about the available desktop area
So that it can make correct window management decisions
Plus some refactorings:
- Make AvailableDeskto
- AvailableDeskto
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
https:/
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable.
* If you changed the UI, has there been a design review?
Not applicable.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal | # |
reading the code it looks good I'd say. One question though:
In Stage.qml we have that boundariesForWi
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal | # |
On 03/03/2017 07:34, Michael Zanetti wrote:
> Review: Needs Information
>
> reading the code it looks good I'd say. One question though:
>
> In Stage.qml we have that boundariesForWi
Good point. I forgot about boundariesForWi
merge the two.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2839
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal | # |
I'm wondering why we still need those restrictions in Stage.qml at all, like the minimumY for WindowStateSaver, or the boundsItem on the MoveResizeArea. I would think now that miral knows the limits the qml code should not need to care about this any more at all? Perhaps miral is not quite there yet, I'm not sure. If we still need to provide those informations to the qml code, wouldn't it make sense to at least drop root.leftMargin etc and use the availableDeskto
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal | # |
On 03/03/2017 08:42, Michael Zanetti wrote:
> Review: Needs Information
>
> I'm wondering why we still need those restrictions in Stage.qml at all, like the minimumY for WindowStateSaver, or the boundsItem on the MoveResizeArea. I would think now that miral knows the limits the qml code should not need to care about this any more at all?
Yeah, miral/qtmir might take care of it in the future. But they don't do
it right now.
> Perhaps miral is not quite there yet, I'm not sure.
It's not AFAICT.
> If we still need to provide those informations to the qml code, wouldn't it make sense to at least drop root.leftMargin etc and use the availableDeskto
Done. Also replaced usage of Panel.panelHeight with AvailableDeskto
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2840
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2841
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal | # |
Code looks good now, tested it, works fine.
I've added ppa:ci-
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:2841
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal | # |
Text conflict in qml/Stage/
1 conflicts encountered.
Was top-approved already.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal | # |
Rebased on top of latest trunk and added a new commit:
rev 2872 "Use a WindowMargins component instead of MirSurface.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Albert Astals Cid (aacid) : Posted in a previous version of this proposal | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2872
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2873
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal | # |
Text conflict in plugins/
Text conflict in qml/Stage/
Text conflict in qml/Stage/Stage.qml
3 conflicts encountered.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal | # |
On 24/03/2017 05:22, Albert Astals Cid wrote:
> Text conflict in plugins/
> Text conflict in qml/Stage/
> Text conflict in qml/Stage/Stage.qml
> 3 conflicts encountered.
fixed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal | # |
Code looks good to me. Still need to test it. Building a silo with the related branches...
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2891
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2893
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Albert Astals Cid (aacid) : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Michael Zanetti (mzanetti) wrote : | # |
ok. tested it. works fine. kicked another CI build as the test failure above doesn't look related
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2893
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2893
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2893
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2837 /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/3270/ /unity8- jenkins. ubuntu. com/job/ build/4301/ console /unity8- jenkins. ubuntu. com/job/ build-0- fetch/4329 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 4163/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= zesty/4163/ console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 4163/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= zesty/4163/ console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 4163/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= zesty/4163/ console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/3270/ rebuild
https:/