Merge lp:~kgunn72/unity-mir/fix-1344639-input-area into lp:unity-mir

Proposed by kevin gunn
Status: Merged
Approved by: kevin gunn
Approved revision: 244
Merged at revision: 244
Proposed branch: lp:~kgunn72/unity-mir/fix-1344639-input-area
Merge into: lp:unity-mir
Diff against target: 20 lines (+4/-5)
1 file modified
src/modules/Unity/Application/inputarea.cpp (+4/-5)
To merge this branch: bzr merge lp:~kgunn72/unity-mir/fix-1344639-input-area
Reviewer Review Type Date Requested Status
kevin gunn (community) Approve
Review via email: mp+227266@code.launchpad.net

Commit message

this is a fix for bug 1343639

Description of the change

this is a fix for bug 1343639

To post a comment you must log in.
Revision history for this message
kevin gunn (kgunn72) wrote :

this is a redo of a previous fix
accidental revert of https://code.launchpad.net/~afrantzis/unity-mir/fix-1332624-input-area/+merge/224768

approving based on previous review approvals, bug fix verification

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/modules/Unity/Application/inputarea.cpp'
2--- src/modules/Unity/Application/inputarea.cpp 2014-07-08 12:10:47 +0000
3+++ src/modules/Unity/Application/inputarea.cpp 2014-07-17 22:37:15 +0000
4@@ -178,12 +178,11 @@
5 {
6 DLOG("InputArea::setMirInputArea (this=%p, x=%lf, y=%lf, width=%lf, height=%lf)", this, relativeGeometry.x(), relativeGeometry.y(), relativeGeometry.width(), relativeGeometry.height());
7 using namespace mir::geometry;
8- const QRect rect = parentItem()->mapRectToScene(relativeGeometry).toRect();
9
10- m_mirInputArea.top_left.x = X{rect.x()};
11- m_mirInputArea.top_left.y = Y{rect.y()};
12- m_mirInputArea.size.width = Width{rect.width()};
13- m_mirInputArea.size.height = Height{rect.height()};
14+ m_mirInputArea.top_left.x = X{relativeGeometry.x()};
15+ m_mirInputArea.top_left.y = Y{relativeGeometry.y()};
16+ m_mirInputArea.size.width = Width{relativeGeometry.width()};
17+ m_mirInputArea.size.height = Height{relativeGeometry.height()};
18
19 if (m_surface) {
20 m_surface->installInputArea(this);

Subscribers

People subscribed via source and target branches