lp:~compiz-team/compiz/compiz.fix_1024304.1.1

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.11 at revision 3799

PS Jenkins bot (community): Approve (continuous-integration) on 2013-10-30

Christopher Townsend: Approve on 2013-10-30

Marco Trevisan (Treviño): Approve on 2013-10-30

Esokrates: Pending (testing, benchmarking) requested 2013-07-24

Andrea Azzarone: Pending requested 2013-07-24

Timo Jyrinki: Pending (build&run) requested 2013-07-24

MC Return: Pending requested 2013-07-24

Daniel van Vugt: Pending requested 2013-07-24

Sam Spilsbury: Pending requested 2013-07-24

Diff: 2221 lines (+1500/-72)

17 files modified

plugins/composite/CMakeLists.txt (+6/-1)
plugins/composite/include/composite/agedamagequery.h (+53/-0)
plugins/composite/include/composite/composite.h (+53/-14)
plugins/composite/src/backbuffertracking/CMakeLists.txt (+31/-0)
plugins/composite/src/backbuffertracking/include/backbuffertracking.h (+125/-0)
plugins/composite/src/backbuffertracking/src/backbuffertracking.cpp (+214/-0)
plugins/composite/src/backbuffertracking/tests/CMakeLists.txt (+22/-0)
plugins/composite/src/backbuffertracking/tests/test-composite-backbuffertracking.cpp (+449/-0)
plugins/composite/src/privates.h (+18/-2)
plugins/composite/src/screen.cpp (+149/-11)
plugins/opengl/include/opengl/opengl.h (+18/-3)
plugins/opengl/src/paint.cpp (+25/-6)
plugins/opengl/src/privates.h (+31/-4)
plugins/opengl/src/screen.cpp (+297/-30)
plugins/opengl/src/window.cpp (+1/-1)
plugins/water/src/water.cpp (+7/-0)
plugins/water/src/water.h (+1/-0)

api

Superseded for merging into lp:compiz/0.9.10

Daniel van Vugt: Needs Resubmitting on 2013-07-23

PS Jenkins bot (community): Approve (continuous-integration) on 2013-07-22

MC Return: Pending requested 2013-05-26

Andrea Azzarone: Pending requested 2013-05-26

Esokrates: Pending (testing, benchmarking) requested 2013-05-26

Timo Jyrinki: Pending (build&run) requested 2013-05-26

Sam Spilsbury: Pending requested 2013-05-26

Diff: 2221 lines (+1500/-72)

17 files modified

plugins/composite/CMakeLists.txt (+6/-1)
plugins/composite/include/composite/agedamagequery.h (+53/-0)
plugins/composite/include/composite/composite.h (+53/-14)
plugins/composite/src/backbuffertracking/CMakeLists.txt (+31/-0)
plugins/composite/src/backbuffertracking/include/backbuffertracking.h (+125/-0)
plugins/composite/src/backbuffertracking/src/backbuffertracking.cpp (+214/-0)
plugins/composite/src/backbuffertracking/tests/CMakeLists.txt (+22/-0)
plugins/composite/src/backbuffertracking/tests/test-composite-backbuffertracking.cpp (+449/-0)
plugins/composite/src/privates.h (+18/-2)
plugins/composite/src/screen.cpp (+149/-11)
plugins/opengl/include/opengl/opengl.h (+18/-3)
plugins/opengl/src/paint.cpp (+25/-6)
plugins/opengl/src/privates.h (+31/-4)
plugins/opengl/src/screen.cpp (+297/-30)
plugins/opengl/src/window.cpp (+1/-1)
plugins/water/src/water.cpp (+7/-0)
plugins/water/src/water.h (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1024304: Benchmark results (with FBO enabled) in compiz 0.9.8.0 are lower than compiz 0.9.7

Medium

Fix Released

Link a bug report

Related blueprints

3729. By Sam Spilsbury on 2013-07-22

Merge lp:compiz

3728. By Sam Spilsbury on 2013-06-20

Merge lp:compiz

3727. By Sam Spilsbury on 2013-06-11

Merge lp:compiz

3726. By Sam Spilsbury on 2013-05-26

Merge lp:~compiz-team/compiz/compiz.fix_1024304.1

3725. By Sam Spilsbury on 2013-05-26

Added .bzr-repo to .bzrignore

3724. By MC Return on 2013-05-25

Rotate Cube code cleanup:

Simplified a few calculations of this type:
(360.0 / (x * 2.0)) == 180 / x
Declaration and assignment of variables in one line.
Use pre- instead of postfix de- and increments.
Merged if condition checks.
Added and removed newlines and brackets.
Fixed indentation.
Added TODO comments.

Approved by PS Jenkins bot, Sam Spilsbury.

3723. By MC Return on 2013-05-25

action.cpp and actions.cpp code cleanup:

Use pre- instead of postfix increment.
Declaration and assignment of variables in one line.
Merged if condition checks.
Removed redundant brackets.
Added and removed newlines.
Fixed indentation.

Approved by PS Jenkins bot, Sam Spilsbury.

3722. By Sami Jaktholm on 2013-05-25

Grid: Fix window misplacement if a window is restored but the size doesn't
      change.

- Set isGridResized to false before configuring the window in
  GridScreen::restoreWindow.

  If the restored geometry is the same as current geometry, configureXWindow
  will trigger moveNotify instead of resizeNotify. As isGridResized is still
  true, GridWindow::moveNotify blocks the restoration movement and the pointer
  detaches from the decoration.

- Don't use pointerBufs when calculating position of the restored window with
  snapback windows disabled.

  The window will be positioned a bit too high (or low) and the pointer
  detaches from decoration if the movement was actually tracked. This was a
  workaround for the first point and can be safely removed. Fixes: https://bugs.launchpad.net/bugs/1115344.

Approved by PS Jenkins bot, MC Return.

3721. By Sami Jaktholm on 2013-05-21

Fade: Fix a typo that causes fade to constantly damage windows with a modified
      saturation. Fixes: https://bugs.launchpad.net/bugs/1159054.

Approved by PS Jenkins bot, Stephen M. Webb, MC Return.

3720. By MC Return on 2013-05-20

Cube code cleanup:

Replaced 0xffff with GLfloat MaxUShortFloat = static_cast <GLfloat>
(std::numeric_limits <unsigned short>::max ());.
Use prefix instead of postfix de- and increments.
Declaration and assignment of variables in one line.
Declare variables shortly before you need them.
Merged if condition checks.
Added missing breaks (just a style issue).
Added and removed brackets.
Added and removed newlines.
Fixed indentation.

Approved by PS Jenkins bot, Sam Spilsbury.