← Back to branch summary

~smspillaz/compiz-core/compiz-core.fix_898469

~smspillaz/compiz-core/compiz-core.fix_898469

« back to all changes in this revision

Viewing changes to plugins/composite/src/window.cpp

Committer: smspillaz
Date: 2012-01-19 09:27:45 UTC
mfrom: (2910.1.57 compiz-core.fix_898465)
Revision ID: sam.spilsbury@canonical.com-20120119092745-k96plvfy4m8emhur

Merged compiz-core.fix_898465 into compiz-core.fix_898469.

files added:
include/core/abiversion.h

include/core/deg2rad.h

files modified:
include/core/CMakeLists.txt

include/core/action.h

include/core/core.h

include/core/countedlist.h

include/core/match.h

include/core/output.h

include/core/plugin.h

include/core/propertywriter.h

plugins/annotate/src/annotate.cpp

plugins/annotate/src/annotate.h

plugins/blur/src/blur.h

plugins/clone/src/clone.h

plugins/commands/src/commands.cpp

plugins/commands/src/commands.h

plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h

plugins/compiztoolbox/src/compiztoolbox.cpp

plugins/composite/include/composite/composite.h

plugins/composite/src/composite.cpp

plugins/composite/src/window.cpp

plugins/copytex/src/copytex.h

plugins/cube/include/cube/cube.h

plugins/dbus/src/dbus.h

plugins/decor/src/decor.cpp

plugins/decor/src/decor.h

plugins/fade/src/fade.h

plugins/gnomecompat/src/gnomecompat.h

plugins/imgpng/src/imgpng.cpp

plugins/imgpng/src/imgpng.h

plugins/imgsvg/src/imgsvg.cpp

plugins/imgsvg/src/imgsvg.h

plugins/ini/src/ini.cpp

plugins/ini/src/ini.h

plugins/inotify/src/inotify.cpp

plugins/inotify/src/inotify.h

plugins/kde/src/kde.h

plugins/move/src/move.h

plugins/obs/src/obs.h

plugins/opengl/include/opengl/fragment.h

plugins/opengl/include/opengl/texture.h

plugins/opengl/src/fragment.cpp

plugins/opengl/src/matrix.cpp

plugins/opengl/src/opengl.cpp

plugins/opengl/src/paint.cpp

plugins/opengl/src/privates.h

plugins/opengl/src/privatetexture.h

plugins/opengl/src/texture.cpp

plugins/place/src/place.h

plugins/regex/src/regex.cpp

plugins/regex/src/regexplugin.h

plugins/resize/src/resize.cpp

plugins/resize/src/resize.h

plugins/rotate/src/rotate.cpp

plugins/rotate/src/rotate.h

plugins/scale/include/scale/scale.h

plugins/screenshot/src/screenshot.cpp

plugins/screenshot/src/screenshot.h

plugins/water/src/water.cpp

plugins/water/src/water.h

plugins/zoom/src/zoom.cpp

plugins/zoom/src/zoom.h

src/event.cpp

src/main.cpp

src/match.cpp

src/option.cpp

src/output.cpp

src/plugin.cpp

src/pluginclasshandler/tests/test-pluginclasshandler.cpp

src/pluginclasshandler/tests/test-pluginclasshandler.h

src/privatescreen.h

src/propertywriter.cpp

src/rect/include/core/rect.h

src/region.cpp

src/screen.cpp

src/session.cpp

src/string/tests/printf/src/test-string-printf.cpp

src/timer/tests/test-timer.h

src/window.cpp

Show diffs side-by-side

added added

removed removed

plugins/composite/src/window.cpp

634

634

/* Translate by position offset */

635

635

oldGeom.setPos (oldGeom.pos () + cWindow->paintOffset ());

636

636

637

compiz::window::Geometry newGeom = oldGeom;

638

639

637

/* Since the geometry has already been updated

640

638

* at resizeNotify time, we must compute the old

641

639

* geometry */

Older »