Unity

Merge lp:~townsend/unity/fix-lp1308265-trusty into lp:unity/7.2

  1. fix-lp1308265-trusty
  2. Merge into trusty
Proposed by Christopher Townsend
Status: Merged
Approved by: Stephen M. Webb
Approved revision: no longer in the source branch.
Merged at revision: 3828
Proposed branch: lp:~townsend/unity/fix-lp1308265-trusty
Merge into: lp:unity/7.2
Diff against target: 14 lines (+3/-1)
1 file modified
lockscreen/LockScreenController.cpp (+3/-1)
To merge this branch: bzr merge lp:~townsend/unity/fix-lp1308265-trusty
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Stephen M. Webb (community) Approve
Review via email: mp+259291@code.launchpad.net

Commit message

Forward first key event that happens on top of the blank window to the lockscreen.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3821
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-7.2-ci/3/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3821
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-7.2-ci/13/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lockscreen/LockScreenController.cpp'
2--- lockscreen/LockScreenController.cpp 2014-12-16 19:27:36 +0000
3+++ lockscreen/LockScreenController.cpp 2015-05-15 19:56:12 +0000
4@@ -322,7 +322,9 @@
5 blank_window_->mouse_move.connect([this](int, int, int dx, int dy, unsigned long, unsigned long) {
6 if ((dx || dy) && !lockscreen_timeout_) HideBlankWindow();
7 });
8- blank_window_->key_down.connect([this] (unsigned long, unsigned long e, unsigned long, const char*, unsigned short) {
9+ blank_window_->key_down.connect([this] (unsigned long et, unsigned long k, unsigned long s, const char* c, unsigned short kc) {
10+ if (prompt_view_.GetPointer() && prompt_view_->focus_view())
11+ prompt_view_->focus_view()->key_down.emit(et, k, s, c, kc);
12 if (!lockscreen_timeout_) HideBlankWindow();
13 });
14 blank_window_->mouse_down.connect([this] (int, int, unsigned long, unsigned long) {

Subscribers

People subscribed via source and target branches

to status/vote changes: