← Back to branch summary

~smspillaz/compiz-plugins-main/compiz-plugins.work_923683

« back to all changes in this revision

Viewing changes to snap/src/snap.cpp

  • Committer: smspillaz
  • Date: 2012-04-12 02:23:37 UTC
  • Revision ID: sam.spilsbury@canonical.com-20120412022337-221wjn1jb78016h8
Use serverGeometry

Show diffs side-by-side

added added

removed removed

Lines of Context:
snap/src/snap.cpp
60
60
void
61
61
SnapWindow::resize (int dx, int dy, int dwidth, int dheight)
62
62
{
63
 
    CompWindow::Geometry geometry = window->geometry ();
 
63
    const CompWindow::Geometry &geometry = window->serverGeometry ();
64
64
    skipNotify = true;
65
65
    window->resize (geometry.x () + dx, geometry.y () + dy,
66
66
                    geometry.width () + dwidth, geometry.height () + dheight,
422
422
        // Update snapping data
423
423
        if (ss->optionGetSnapTypeMask () & SnapTypeEdgeResistanceMask)
424
424
        {
425
 
            snapGeometry = window->geometry ();
 
425
            snapGeometry = window->serverGeometry ();
426
426
            this->snapDirection |= snapDirection;
427
427
        }
428
428
        // Attract the window if needed, moving it of the correct dist
745
745
    if (!ss->snapping)
746
746
        return;
747
747
 
748
 
    dx = snapGeometry.x () - window->geometry ().x ();
749
 
    dy = snapGeometry.y () - window->geometry ().y ();
 
748
    dx = snapGeometry.x () - window->serverGeometry ().x ();
 
749
    dy = snapGeometry.y () - window->serverGeometry ().y ();
750
750
 
751
751
    // apply edge resistance
752
752
    if (ss->optionGetSnapTypeMask () & SnapTypeEdgeResistanceMask)