Merge lp:~townsend/compiz/fix-decoration-grab-0.9.10 into lp:compiz/0.9.10

[Christopher Townsend]

Fix issue where non-resizable windows and semi-maximized window would have an area near the top of the title bar that could not be grabbed.

= Issue =
On non-resizable windows or semi-maximized windows, approximately the top half to top third of the title bar decoration is not grabable for moving the window. This is due to a regression introduced in http://bazaar.launchpad.net/~compiz-team/compiz/0.9.10/revision/3735.

= Fix =
After much debugging, I discovered that these particular type of windows call the middle/middle event_window_position twice, so this was throwing off the y coordinate. Other window types just call this once. The y coordinate is not needed for these types of windows because there cannot be an invisible border to resize the window, so now just check if the window is able to be vertically resized, and if so, then add the y coordinate.

Note that this is the same fix that is proposed for trunk.

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'gtk/window-decorator/metacity.c'
--- gtk/window-decorator/metacity.c	2013-06-04 14:11:23 +0000
+++ gtk/window-decorator/metacity.c	2013-10-01 15:53:52 +0000
@@ -1108,7 +1108,7 @@
 	*x += d->frame->win_extents.left + 4;
 	*y += d->frame->win_extents.top + 2;
     }
-    
+
     if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
     {
 	*x += mutter_draggable_border_width;
@@ -1389,7 +1389,8 @@
 	    if (!d->frame_window)
 	    {
 		*x += mutter_draggable_border_width;
-		*y += mutter_draggable_border_width;
+		if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
+		    *y += mutter_draggable_border_width;
 	    }
 
 	    break;