~smspillaz/compiz-core/compiz-core.geometry-tests

« back to all changes in this revision

Viewing changes to src/window.cpp

  • Committer: Daniel van Vugt
  • Date: 2012-01-16 09:10:42 UTC
  • Revision ID: vanvugt@gmail.com-20120116091042-8mnav1z0th8v25yj
Fixes focus being on the wrong window after viewport changes (LP: #896762)
Merged from lp:~smspillaz/compiz-core/fix_896762

Show diffs side-by-side

added added

removed removed

Lines of Context:
2549
2549
    if (!priv->shaded && (priv->state & CompWindowStateHiddenMask))
2550
2550
        return false;
2551
2551
 
2552
 
    if (priv->geometry.x () + priv->width  <= 0 ||
2553
 
        priv->geometry.y () + priv->height <= 0 ||
2554
 
        priv->geometry.x () >= (int) screen->width ()||
2555
 
        priv->geometry.y () >= (int) screen->height ())
 
2552
    if (priv->serverGeometry.x () + priv->serverGeometry.width ()  <= 0 ||
 
2553
        priv->serverGeometry.y () + priv->serverGeometry.height () <= 0 ||
 
2554
        priv->serverGeometry.x () >= (int) screen->width ()||
 
2555
        priv->serverGeometry.y () >= (int) screen->height ())
2556
2556
        return false;
2557
2557
 
2558
2558
    return true;