Merge lp://qastaging/~3v1n0/unity/decorations-menu into lp://qastaging/unity
Proposed by
Marco Trevisan (Treviño)
| Status: | Merged |
|---|---|
| Approved by: | Christopher Townsend |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 3659 |
| Proposed branch: | lp://qastaging/~3v1n0/unity/decorations-menu |
| Merge into: | lp://qastaging/unity |
| Diff against target: |
350 lines (+88/-56) 15 files modified
decorations/DecorationsGrabEdge.cpp (+4/-1) decorations/DecorationsInputMixer.cpp (+6/-0) decorations/DecorationsInputMixer.h (+1/-0) decorations/DecorationsManager.cpp (+6/-0) panel/PanelMenuView.cpp (+20/-0) panel/PanelMenuView.h (+1/-0) panel/PanelTitlebarGrabAreaView.cpp (+9/-5) panel/PanelTitlebarGrabAreaView.h (+1/-0) panel/PanelView.cpp (+2/-26) unity-shared/PluginAdapter.cpp (+5/-0) unity-shared/PluginAdapter.h (+1/-0) unity-shared/StandaloneWindowManager.h (+2/-0) unity-shared/WindowManager.h (+2/-0) unity-shared/XWindowManager.cpp (+27/-24) unity-shared/XWindowManager.h (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~3v1n0/unity/decorations-menu |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Christopher Townsend (community) | Approve | ||
|
Review via email:
|
|||
Commit message
{DecorationsGra
Description of the change
Added support for right-click menus over decorations, to fix the regression we had due to new decorations.
This also highlighted a bug of InputMixer because if while pressing a mouse button something steals us the control, we need to ungrab the pointer... Quite the same we need to show up menus in Nux, so moved the function to do that in WindowManager (as it's used already 3 times).
It needs bamf trunk (or at least lp:~3v1n0/bamf/window-action-menu).
To post a comment you must log in.
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)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:3664
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://