lp:~mc-return/compiz/compiz.merge-wizard-improvements

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:compiz/0.9.10

Compiz Maintainers: Pending requested 2013-05-28

Diff: 1227 lines (+380/-283)

2 files modified

plugins/wizard/src/wizard.cpp (+308/-214)
plugins/wizard/src/wizard.h (+72/-69)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3728. By MC Return on 2013-05-28

Wizard improvements (please see main commit message for details)

3727. By MC Return on 2013-05-28

Opacify code cleanup:

Declaration of local variables outside of loops.
Calculate activeOpacity and targetOpacity just once, not for each window.
Use prefix instead of postfix increments.
Merged if condition checks.
Declaration and assignment of local variables in one line.
Added and removed newlines.
Removed redundant brackets.
Fixed indentation.

Opacify, functionality fix:

Improved the toggling logic by setting isToggle in the constructor according to
the startup setting, then calling setFunctions (isToggle);,which then calls
screen->handleEventSetEnabled (os, os->isToggle); to fix Opacify ignoring the
"Toggle Opacify on by default" setting.

(LP: #787814). Fixes: https://bugs.launchpad.net/bugs/787814.

Approved by PS Jenkins bot, Sam Spilsbury.

3726. By MC Return on 2013-05-28

Fade plugin, minor code cleanup:

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

Approved by PS Jenkins bot, Sam Spilsbury.

3725. By Sami Jaktholm on 2013-05-26

Fix memory leaks in titleinfo plugin. Fixes: https://bugs.launchpad.net/bugs/1101454, https://bugs.launchpad.net/bugs/1101569.

Approved by PS Jenkins bot, Sam Spilsbury.

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.

3719. By MC Return on 2013-05-20

Commands, minor code cleanup:

Declaration and assignment of variables in one line.
Return ASAP.
Added and removed newlines.
Fixed indentation.

Approved by PS Jenkins bot, Sam Spilsbury.