← Back to branch summary

~ubuntu-branches/ubuntu/raring/qt4-x11/raring

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_33_shaped_drag.diff

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-04-24 16:44:41 UTC
  • Revision ID: package-import@ubuntu.com-20120424164441-2i10dxh8rp31n98w
Tags: 4:4.8.1-0ubuntu4.1
https://launchpad.net/bugs/987855
Add kubuntu_33_shaped_drag.diff fixes LP: #987855
"problem in Qt dragging when all of the window target has been
shaped out for input"

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_33_shaped_drag.diff
 
1
commit f5eb19bc4dca6f3bfaaf832784a3cbca24dba479
 
2
Author: Albert Astals Cid <albert.astals@canonical.com>
 
3
Date:   Tue Apr 24 13:45:46 2012 +0200
 
4
    No rectangles means no interaction with the window
 
5
    And some tests to prove this change is needed
 
6
    Change-Id: I6dd6c75c2bd70463561445b4f4a3894c80981d26
 
7
 
 
8
Index: qt4-x11-4.8.1/src/gui/kernel/qdnd_x11.cpp
 
9
===================================================================
 
10
--- qt4-x11-4.8.1.orig/src/gui/kernel/qdnd_x11.cpp      2012-04-24 16:43:29.248208902 +0100
 
11
+++ qt4-x11-4.8.1/src/gui/kernel/qdnd_x11.cpp   2012-04-24 16:43:40.960208473 +0100
 
12
@@ -1431,9 +1431,8 @@
 
13
 {
 
14
     int nrectanglesRet, dummyOrdering;
 
15
     XRectangle *rectangles = XShapeGetRectangles(QX11Info::display(), w, shapeType, &nrectanglesRet, &dummyOrdering);
 
16
-    bool interacts = true;
 
17
+    bool interacts = false;
 
18
     if (rectangles) {
 
19
-        interacts = false;
 
20
         for (int i = 0; !interacts && i < nrectanglesRet; ++i)
 
21
             interacts = QRect(rectangles[i].x, rectangles[i].y, rectangles[i].width, rectangles[i].height).contains(pos);
 
22
         XFree(rectangles);