Merge lp:~azzar1/compiz/invisible-borders-titlebar into lp:compiz/0.9.10

Proposed by Andrea Azzarone
Status: Merged
Approved by: Andrea Azzarone
Approved revision: 3734
Merged at revision: 3735
Proposed branch: lp:~azzar1/compiz/invisible-borders-titlebar
Merge into: lp:compiz/0.9.10
Diff against target: 107 lines (+20/-1)
1 file modified
gtk/window-decorator/metacity.c (+20/-1)
To merge this branch: bzr merge lp:~azzar1/compiz/invisible-borders-titlebar
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Christopher Townsend Approve
Sam Spilsbury Approve
Review via email: mp+167290@code.launchpad.net

Commit message

Extends invisible borders to the title bar too.

(LP: #717444)

Description of the change

== Problem ==
#717444 Window management - Invisible border does not extend to the top of the window

== Fix ==
Extend invisible border to the top of the window too. Not sure why it was disabled before, but seems to work fine now.

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

I had been meaning to get around to this for a while, thanks for that!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Oops, looks like a test got broken on upgrade to saucy. I'll get a fix in for that now.

Revision history for this message
Christopher Townsend (townsend) wrote :

LGTM, so approving as well.

The CI looks suspicious, but I doubt it's related to this MP.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote :
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

(Note: autolanding and CI will keep failing until that fix is merged in, sorry about that).

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'gtk/window-decorator/metacity.c'
--- gtk/window-decorator/metacity.c 2013-05-13 15:39:25 +0000
+++ gtk/window-decorator/metacity.c 2013-06-04 14:21:49 +0000
@@ -74,7 +74,9 @@
74 if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)74 if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
75 {75 {
76 frame_win_extents.bottom += mutter_draggable_border_width;76 frame_win_extents.bottom += mutter_draggable_border_width;
77 frame_win_extents.top += mutter_draggable_border_width;
77 frame_max_win_extents.bottom += mutter_draggable_border_width;78 frame_max_win_extents.bottom += mutter_draggable_border_width;
79 frame_max_win_extents.top += mutter_draggable_border_width;
78 }80 }
79 }81 }
8082
@@ -1106,11 +1108,17 @@
1106 *x += d->frame->win_extents.left + 4;1108 *x += d->frame->win_extents.left + 4;
1107 *y += d->frame->win_extents.top + 2;1109 *y += d->frame->win_extents.top + 2;
1108 }1110 }
1109 else if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)1111
1112 if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
1110 {1113 {
1111 *x += mutter_draggable_border_width;1114 *x += mutter_draggable_border_width;
1112 }1115 }
11131116
1117 if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
1118 {
1119 *y += mutter_draggable_border_width;
1120 }
1121
1114 return TRUE;1122 return TRUE;
1115}1123}
11161124
@@ -1305,6 +1313,7 @@
1305 if (!d->frame_window)1313 if (!d->frame_window)
1306 {1314 {
1307 *x += mutter_draggable_border_width;1315 *x += mutter_draggable_border_width;
1316 *y += mutter_draggable_border_width;
1308 *w += mutter_draggable_border_width;1317 *w += mutter_draggable_border_width;
1309 *h += mutter_draggable_border_width;1318 *h += mutter_draggable_border_width;
1310 }1319 }
@@ -1322,6 +1331,7 @@
1322 if (!d->frame_window)1331 if (!d->frame_window)
1323 {1332 {
1324 *x -= mutter_draggable_border_width;1333 *x -= mutter_draggable_border_width;
1334 *y += mutter_draggable_border_width;
1325 *h += mutter_draggable_border_width;1335 *h += mutter_draggable_border_width;
1326 *w += mutter_draggable_border_width * 2;1336 *w += mutter_draggable_border_width * 2;
1327 }1337 }
@@ -1341,6 +1351,7 @@
13411351
1342 if (!d->frame_window)1352 if (!d->frame_window)
1343 {1353 {
1354 *y += mutter_draggable_border_width;
1344 *w += mutter_draggable_border_width;1355 *w += mutter_draggable_border_width;
1345 *h += mutter_draggable_border_width;1356 *h += mutter_draggable_border_width;
1346 }1357 }
@@ -1362,6 +1373,7 @@
1362 if (!d->frame_window)1373 if (!d->frame_window)
1363 {1374 {
1364 *x += mutter_draggable_border_width;1375 *x += mutter_draggable_border_width;
1376 *y += mutter_draggable_border_width;
1365 *w += mutter_draggable_border_width;1377 *w += mutter_draggable_border_width;
1366 *h += mutter_draggable_border_width;1378 *h += mutter_draggable_border_width;
1367 }1379 }
@@ -1377,6 +1389,7 @@
1377 if (!d->frame_window)1389 if (!d->frame_window)
1378 {1390 {
1379 *x += mutter_draggable_border_width;1391 *x += mutter_draggable_border_width;
1392 *y += mutter_draggable_border_width;
1380 }1393 }
13811394
1382 break;1395 break;
@@ -1392,6 +1405,7 @@
13921405
1393 if (!d->frame_window)1406 if (!d->frame_window)
1394 {1407 {
1408 *y += mutter_draggable_border_width;
1395 *h += mutter_draggable_border_width;1409 *h += mutter_draggable_border_width;
1396 *w += mutter_draggable_border_width;1410 *w += mutter_draggable_border_width;
1397 }1411 }
@@ -1418,6 +1432,7 @@
1418 {1432 {
1419 *x += mutter_draggable_border_width;1433 *x += mutter_draggable_border_width;
1420 *w += mutter_draggable_border_width;1434 *w += mutter_draggable_border_width;
1435 *h += mutter_draggable_border_width;
1421 }1436 }
1422 break;1437 break;
1423 case 1: /* top */1438 case 1: /* top */
@@ -1433,6 +1448,7 @@
1433 {1448 {
1434 *x -= mutter_draggable_border_width;1449 *x -= mutter_draggable_border_width;
1435 *w += mutter_draggable_border_width * 2;1450 *w += mutter_draggable_border_width * 2;
1451 *h += mutter_draggable_border_width;
1436 }1452 }
14371453
1438 break;1454 break;
@@ -1449,7 +1465,10 @@
1449 *h = fgeom.top_height + RESIZE_EXTENDS;1465 *h = fgeom.top_height + RESIZE_EXTENDS;
14501466
1451 if (!d->frame_window)1467 if (!d->frame_window)
1468 {
1452 *w += mutter_draggable_border_width;1469 *w += mutter_draggable_border_width;
1470 *h += mutter_draggable_border_width;
1471 }
14531472
1454 break;1473 break;
1455 }1474 }

Subscribers

People subscribed via source and target branches