Mir

Merge lp:~vanvugt/mir/fix-1437166 into lp:mir

Proposed by Daniel van Vugt
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 2434
Proposed branch: lp:~vanvugt/mir/fix-1437166
Merge into: lp:mir
Diff against target: 17 lines (+2/-0)
1 file modified
playground/demo-shell/window_manager.cpp (+2/-0)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1437166
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+254362@code.launchpad.net

Commit message

mir_proving_server: Remember to return true if an event has been handled.
Otherwise it will be called twice, and for toggle() functions that means
they get instantly inverted, resulting in no change.

This fixes LP: #1437166, but the root cause remains open as LP: #1437174.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Sure

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'playground/demo-shell/window_manager.cpp'
2--- playground/demo-shell/window_manager.cpp 2015-03-25 02:48:40 +0000
3+++ playground/demo-shell/window_manager.cpp 2015-03-27 07:05:41 +0000
4@@ -366,11 +366,13 @@
5 event.key.scan_code == KEY_N)
6 {
7 toggle(inverse);
8+ return true;
9 }
10 else if (event.key.modifiers & mir_key_modifier_meta &&
11 event.key.scan_code == KEY_C)
12 {
13 toggle(contrast);
14+ return true;
15 }
16 }
17 else if (event.type == mir_event_type_motion &&

Subscribers

People subscribed via source and target branches