Merge lp:~unity-2d-team/unity-2d/shell-bounding-shaping into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Michał Sawicz]

[Michał Sawicz (saviq)]

The input shaping tests need to be adapted / extended to take that change into account.

review: Needs Fixing

[Albert Astals Cid (aacid)]

Works

review: Approve

=== modified file 'libunity-2d-private/src/inputshapemanager.cpp'
--- libunity-2d-private/src/inputshapemanager.cpp	2012-02-01 14:59:15 +0000
+++ libunity-2d-private/src/inputshapemanager.cpp	2012-02-03 16:25:42 +0000
@@ -39,7 +39,7 @@
     // pixmap created from the mask bitmap. However for some reason I wasn't able to figure out yet
     // I get a lot of warnings when calling QBitmap::handle, so for now I'm passing a region as a
     // workaround.
-    XShapeCombineRegion(QX11Info::display(), m_target->effectiveWinId(), ShapeInput,
+    XShapeCombineRegion(QX11Info::display(), m_target->effectiveWinId(), ShapeBounding,
                         0, 0, QRegion(inputShape).handle(), ShapeSet);
 }
 

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-01-30 14:31:40 +0000
+++ shell/Shell.qml	2012-02-03 16:25:42 +0000
@@ -121,14 +121,20 @@
         InputShapeRectangle {
             // Prevent the launcher mask to ever go to negative values or be less than 1 pixel
             // (to preserve the autohide/intellihide edge detection)
+            // FIXME: this results in a 1px wide white rectangle on the launcher edge, we should switch
+            //        to cpp-based edge detection, and later XFixes barriers to get rid of that completely
             rectangle: Qt.rect(0, launcherLoader.y,
-                               launcherLoader.visibilityController.shown ? launcherLoader.width : 1,
+                               -launcherLoader.x < launcherLoader.width ? launcherLoader.x + launcherLoader.width : 1,
                                launcherLoader.height)
             enabled: launcherLoader.status == Loader.Ready
         }
 
         InputShapeRectangle {
-            rectangle: Qt.rect(dashLoader.x, dashLoader.y, dashLoader.width, dashLoader.height)
+            rectangle: if (screen.isCompositingManagerRunning) {
+                Qt.rect(dashLoader.x, dashLoader.y, dashLoader.width, dashLoader.height)
+            } else {
+                Qt.rect(dashLoader.x, dashLoader.y, dashLoader.width - 7, dashLoader.height - 9)
+            }
             enabled: dashLoader.status == Loader.Ready && dashLoader.item.active
 
             InputShapeMask {