~mc-return/compiz/compiz.merge-src-header-files-cleanup

« back to all changes in this revision

Viewing changes to gtk/window-decorator/metacity.c

  • Committer: MC Return
  • Date: 2013-06-20 05:56:13 UTC
  • mfrom: (3724.2.16 0.9.10)
  • Revision ID: mc.return@gmx.net-20130620055613-8dp00nmw2jpm3ptu
Merged latest lp:compiz and fixed conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
74
74
        if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
75
75
        {
76
76
            frame_win_extents.bottom += mutter_draggable_border_width;
 
77
            frame_win_extents.top += mutter_draggable_border_width;
77
78
            frame_max_win_extents.bottom += mutter_draggable_border_width;
 
79
            frame_max_win_extents.top += mutter_draggable_border_width;
78
80
        }
79
81
    }
80
82
 
1106
1108
        *x += d->frame->win_extents.left + 4;
1107
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
1114
        *x += mutter_draggable_border_width;
1112
1115
    }
1113
1116
 
 
1117
    if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
 
1118
    {
 
1119
        *y += mutter_draggable_border_width;
 
1120
    }
 
1121
 
1114
1122
    return TRUE;
1115
1123
}
1116
1124
 
1305
1313
            if (!d->frame_window)
1306
1314
            {
1307
1315
                *x += mutter_draggable_border_width;
 
1316
                *y += mutter_draggable_border_width;
1308
1317
                *w += mutter_draggable_border_width;
1309
1318
                *h += mutter_draggable_border_width;
1310
1319
            }
1322
1331
            if (!d->frame_window)
1323
1332
            {
1324
1333
                *x -= mutter_draggable_border_width;
 
1334
                *y += mutter_draggable_border_width;
1325
1335
                *h += mutter_draggable_border_width;
1326
1336
                *w += mutter_draggable_border_width * 2;
1327
1337
            }
1341
1351
 
1342
1352
            if (!d->frame_window)
1343
1353
            {
 
1354
                *y += mutter_draggable_border_width;
1344
1355
                *w += mutter_draggable_border_width;
1345
1356
                *h += mutter_draggable_border_width;
1346
1357
            }
1362
1373
           if (!d->frame_window)
1363
1374
           {
1364
1375
               *x += mutter_draggable_border_width;
 
1376
               *y += mutter_draggable_border_width;           
1365
1377
               *w += mutter_draggable_border_width;
1366
1378
               *h += mutter_draggable_border_width;
1367
1379
           }
1377
1389
            if (!d->frame_window)
1378
1390
            {
1379
1391
                *x += mutter_draggable_border_width;
 
1392
                *y += mutter_draggable_border_width;
1380
1393
            }
1381
1394
 
1382
1395
            break;
1392
1405
 
1393
1406
            if (!d->frame_window)
1394
1407
            {
 
1408
                *y += mutter_draggable_border_width;
1395
1409
                *h += mutter_draggable_border_width;
1396
1410
                *w += mutter_draggable_border_width;
1397
1411
            }
1418
1432
            {
1419
1433
                *x += mutter_draggable_border_width;
1420
1434
                *w += mutter_draggable_border_width;
 
1435
                *h += mutter_draggable_border_width;
1421
1436
            }
1422
1437
            break;
1423
1438
        case 1: /* top */
1433
1448
            {
1434
1449
                *x -= mutter_draggable_border_width;
1435
1450
                *w += mutter_draggable_border_width * 2;
 
1451
                *h += mutter_draggable_border_width;
1436
1452
            }
1437
1453
 
1438
1454
            break;
1449
1465
            *h = fgeom.top_height + RESIZE_EXTENDS;
1450
1466
 
1451
1467
            if (!d->frame_window)
 
1468
            {
1452
1469
                *w += mutter_draggable_border_width;
 
1470
                *h += mutter_draggable_border_width;
 
1471
            }
1453
1472
 
1454
1473
            break;
1455
1474
        }