Merge lp:~ricmm/unity-mir/shell-surface-monitor into lp:unity-mir

Proposed by Ricardo Mendoza
Status: Merged
Approved by: Michał Sawicz
Approved revision: 102
Merged at revision: 102
Proposed branch: lp:~ricmm/unity-mir/shell-surface-monitor
Merge into: lp:unity-mir
Diff against target: 11 lines (+1/-0)
1 file modified
src/unity-mir/surfacecontroller.cpp (+1/-0)
To merge this branch: bzr merge lp:~ricmm/unity-mir/shell-surface-monitor
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+189743@code.launchpad.net

Commit message

Make shell surface be an input monitor

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
Michał Sawicz (saviq) wrote :

Yes please.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/unity-mir/surfacecontroller.cpp'
--- src/unity-mir/surfacecontroller.cpp 2013-08-21 22:43:09 +0000
+++ src/unity-mir/surfacecontroller.cpp 2013-10-08 00:00:58 +0000
@@ -49,6 +49,7 @@
49 DLOG("Shell depth");49 DLOG("Shell depth");
50 auto newParams = params;50 auto newParams = params;
51 newParams.depth = shellSurfaceDepth;51 newParams.depth = shellSurfaceDepth;
52 newParams.input_mode = mir::input::InputReceptionMode::receives_all_input;
52 shellSurfaceFound = true;53 shellSurfaceFound = true;
53 return surface_stack->create_surface(newParams);54 return surface_stack->create_surface(newParams);
54 } else if (params.name == "MaliitOnScreenKeyboard") { // FIXME: string hardcoded into maliit55 } else if (params.name == "MaliitOnScreenKeyboard") { // FIXME: string hardcoded into maliit

Subscribers

People subscribed via source and target branches