← Back to branch summary

~compiz-team/compiz-core/oneiric.force_output_detection

« back to all changes in this revision

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

  • Committer: Sam Spilsbury
  • Date: 2011-08-22 10:48:12 UTC
  • mfrom: (2753.21.15 compiz-core)
  • Revision ID: sam.spilsbury@canonical.com-20110822104812-kounfdbe90q0sw96
Merge in changes from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/resize/src/resize.cpp
894
894
        cwi = wi;
895
895
        che = he;
896
896
 
897
 
        if (w->constrainNewWindowSize (wi, he, &cwi, &che))
 
897
        if (w->constrainNewWindowSize (wi, he, &cwi, &che) &&
 
898
            mode != ResizeOptions::ModeNormal)
898
899
        {
899
900
            Box box;
900
901