Merge lp://staging/~3v1n0/unity/input-monitor-lockscreen-controller into lp://staging/unity
Proposed by
Marco Trevisan (Treviño)
Status: | Merged |
---|---|
Approved by: | Andrea Azzarone |
Approved revision: | no longer in the source branch. |
Merged at revision: | 4207 |
Proposed branch: | lp://staging/~3v1n0/unity/input-monitor-lockscreen-controller |
Merge into: | lp://staging/unity |
Prerequisite: | lp://staging/~3v1n0/unity/input-monitor-lockscreen-blank-window |
Diff against target: |
189 lines (+34/-44) 7 files modified
lockscreen/KylinLockScreenShield.cpp (+0/-18) lockscreen/KylinLockScreenShield.h (+0/-3) lockscreen/LockScreenBaseShield.cpp (+13/-5) lockscreen/LockScreenBaseShield.h (+1/-2) lockscreen/LockScreenController.cpp (+18/-5) lockscreen/LockScreenController.h (+1/-0) lockscreen/LockScreenShield.cpp (+1/-11) |
To merge this branch: | bzr merge lp://staging/~3v1n0/unity/input-monitor-lockscreen-controller |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrea Azzarone (community) | Approve | ||
Review via email: mp+304396@code.staging.launchpad.net |
Commit message
LockScreenContr
In this way we can safely switch the monitor also on button click (after closing a menu)
or when moving over the panel (that wasn't properly handled before).
To post a comment you must log in.
+1