Merge lp://qastaging/~unity-2d-team/unity-2d/unity-2d-shell-shaped-testability-shapetests into lp://qastaging/~unity-2d-team/unity-2d/unity-2d-shell
Proposed by
Ugo Riboni
Status: | Merged |
---|---|
Approved by: | Michał Sawicz |
Approved revision: | 937 |
Merged at revision: | 921 |
Proposed branch: | lp://qastaging/~unity-2d-team/unity-2d/unity-2d-shell-shaped-testability-shapetests |
Merge into: | lp://qastaging/~unity-2d-team/unity-2d/unity-2d-shell |
Diff against target: |
1073 lines (+812/-51) 20 files modified
CMakeLists.txt (+1/-0) libunity-2d-private/Unity2d/plugin.cpp (+10/-0) libunity-2d-private/src/CMakeLists.txt (+3/-0) libunity-2d-private/src/inputshapemanager.cpp (+87/-0) libunity-2d-private/src/inputshapemanager.h (+38/-0) libunity-2d-private/src/inputshapemask.cpp (+88/-0) libunity-2d-private/src/inputshapemask.h (+48/-0) libunity-2d-private/src/inputshaperectangle.cpp (+86/-0) libunity-2d-private/src/inputshaperectangle.h (+49/-0) libunity-2d-private/src/unity2ddeclarativeview.cpp (+6/-0) libunity-2d-private/src/unity2ddeclarativeview.h (+2/-0) shell/MERGE-TODO (+0/-2) shell/Shell.qml (+27/-1) shell/app/shelldeclarativeview.cpp (+1/-46) shell/app/shelldeclarativeview.h (+1/-1) shell/dash/Home.qml (+1/-0) tests/getshape/CMakeLists.txt (+22/-0) tests/getshape/getshape.cpp (+102/-0) tests/run-tests.rb (+1/-1) tests/shell/input_shaping.rb (+239/-0) |
To merge this branch: | bzr merge lp://qastaging/~unity-2d-team/unity-2d/unity-2d-shell-shaped-testability-shapetests |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michał Sawicz | Approve | ||
Review via email:
|
Description of the change
[shell] Shape the shell window input according to what components are visible
To post a comment you must log in.
* inputshapemask. cpp:19 always add a trailing slash to unity2dDirectory() as it doesn't do that internally (see bug 918669) iveview. cpp:161 any reason for the #include there?
* one thing I'm afraid of: animating the launcher shape looks unnecessary and a resource drain, could we have just the "fully-on-screen" shape, enabled or disabled as soon as the launcher is supposed to be shown?
* unity2ddeclarat