Merge lp://staging/~bregma/unity/lp-1312137-trusty into lp://staging/unity/7.2
Proposed by
Stephen M. Webb
| Status: | Merged |
|---|---|
| Approved by: | Christopher Townsend |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 3818 |
| Proposed branch: | lp://staging/~bregma/unity/lp-1312137-trusty |
| Merge into: | lp://staging/unity/7.2 |
| Diff against target: |
845 lines (+217/-96) 17 files modified
UnityCore/AppmenuIndicator.cpp (+24/-0) UnityCore/AppmenuIndicator.h (+8/-0) com.canonical.Unity.gschema.xml (+8/-0) decorations/DecoratedWindow.cpp (+24/-14) decorations/DecorationsForceQuitDialog.cpp (+24/-18) decorations/DecorationsManager.cpp (+10/-3) decorations/DecorationsSlidingLayout.cpp (+14/-8) decorations/DecorationsSlidingLayout.h (+2/-0) panel/PanelMenuView.cpp (+63/-32) panel/PanelMenuView.h (+4/-1) plugins/unityshell/src/unityshell.cpp (+1/-1) unity-shared/DecorationStyle.cpp (+0/-1) unity-shared/DecorationStyle.h (+0/-1) unity-shared/MenuManager.cpp (+27/-4) unity-shared/MenuManager.h (+5/-1) unity-shared/UScreen.cpp (+3/-6) unity-shared/UnitySettings.cpp (+0/-6) |
| To merge this branch: | bzr merge lp://staging/~bregma/unity/lp-1312137-trusty |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Christopher Townsend (community) | Approve | ||
|
Review via email:
|
|||
Commit message
MenuManager: make sure menus are always shown when mouse is over them or when the always-show-menus option is on
Description of the change
MenuManager: make sure menus are always shown when mouse is over them or when the always-show-menus option is on.
Cherry picked from Unity trunk.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Cherry pick looks fine.