← Back to branch summary

~compiz-team/compiz-core/compiz-core.fix_874004

« back to all changes in this revision

Viewing changes to plugins/decor/src/decor.cpp

  • Committer: Sam Spilsbury
  • Date: 2011-10-11 17:06:57 UTC
  • mfrom: (2876.2.1 compiz-core)
  • Revision ID: sam.spilsbury@canonical.com-20111011170657-q2h3p30hinvckn7a
Merge lp:~compiz-team/compiz-core/compiz-core.fix_865696

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/decor/src/decor.cpp
247
247
                         const CompRegion   &region,
248
248
                         unsigned int       mask)
249
249
{
250
 
    CompRegion reg = (mask & (PAINT_WINDOW_TRANSFORMED_MASK |
251
 
                              PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK |
252
 
                              PAINT_WINDOW_WITH_OFFSET_MASK)) ?
253
 
                           region : shadowRegion.intersected (region);
 
250
    CompRegion reg = shadowRegion.intersected (region);
 
251
 
 
252
    if ((mask & (PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK |
 
253
                 PAINT_WINDOW_WITH_OFFSET_MASK)))
 
254
        reg = region;
 
255
    else if (mask & PAINT_WINDOW_TRANSFORMED_MASK)
 
256
        reg = infiniteRegion;
254
257
 
255
258
    /* In case some plugin needs to paint us with an offset region */
256
259
    if (reg.isEmpty ())