Merge lp:~ricmm/qtubuntu/duplicate_to_parent into lp:qtubuntu

Proposed by Ricardo Mendoza
Status: Merged
Approved by: Michael Frey
Approved revision: 178
Merged at revision: 178
Proposed branch: lp:~ricmm/qtubuntu/duplicate_to_parent
Merge into: lp:qtubuntu
Diff against target: 16 lines (+6/-0)
1 file modified
src/platforms/base/input.cc (+6/-0)
To merge this branch: bzr merge lp:~ricmm/qtubuntu/duplicate_to_parent
Reviewer Review Type Date Requested Status
Michael Frey (community) Approve
Ricardo Salveti (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+186240@code.launchpad.net

Commit message

If window has a parent, send duplicate events to it.

To post a comment you must log in.
178. By Ricardo Mendoza

Only propagate if Qt::WindowTransparentForInput is set

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Tested with the default image, no regression, and also worked fine with the new qtmultimedia packages.

Please sync with asac before getting this approved and in the image.

review: Approve
Revision history for this message
Alexander Sack (asac) wrote :

I am not approving merge proposals. Please get it in trunk when you feel everything is ready. Update the Landing Asks.

Revision history for this message
Michael Frey (mfrey) wrote :

work great.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platforms/base/input.cc'
2--- src/platforms/base/input.cc 2013-08-08 15:29:08 +0000
3+++ src/platforms/base/input.cc 2013-09-18 04:38:10 +0000
4@@ -337,6 +337,12 @@
5 DLOG("QUbuntuBaseInput::postEvent (this=%p, window=%p, event=%p)", this, window, event);
6 QCoreApplication::postEvent(this, new QUbuntuBaseEvent(
7 window, reinterpret_cast<const Event*>(event), eventType_));
8+
9+ if ((window->flags() && Qt::WindowTransparentForInput) && window->parent()) {
10+ DLOG("QUbuntuBaseInput::postEvent (this=%p, window=%p, event=%p)", this, window->parent(), event);
11+ QCoreApplication::postEvent(this, new QUbuntuBaseEvent(
12+ window->parent(), reinterpret_cast<const Event*>(event), eventType_));
13+ }
14 }
15
16 void QUbuntuBaseInput::dispatchMotionEvent(QWindow* window, const void* ev) {

Subscribers

People subscribed via source and target branches