lp:~mc-return/compiz/compiz.merge-fix1101446-and-1101618-and-other-improvements

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:compiz/0.9.11

Compiz Maintainers: Pending requested 2013-07-24

Diff: 583 lines (+135/-121)

3 files modified

plugins/grid/src/grabhandler/include/grabhandler.h (+2/-2)
plugins/grid/src/grid.cpp (+124/-117)
plugins/grid/src/grid.h (+9/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1101446: Coverity UNINIT - CID 12554 - plugins/grid/src/grid.cpp - Declaring variable "xwc" without initializer in function GridScreen::initiateCommon(CompAction *, unsigned int, std::vector<CompOption, std::allocator<CompOption>> &, unsigned int, bool, bool)

High

In Progress

Link a bug report

Related blueprints

3776. By MC Return on 2013-07-24

Merged latest lp:compiz

3775. By MC Return on 2013-07-24

Reduced the .diff
Minor additional fixes

3774. By MC Return on 2013-07-21

Just disable GL_BLEND if it was disabled before

3773. By MC Return on 2013-07-21

Grid: Multiple improvements (please see main commit message for details)

3772. By Sami Jaktholm on 2013-07-21

Expo: Recompute glow quads if a desktop window is resized.

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

Approved by PS Jenkins bot, MC Return, Sam Spilsbury.

3771. By MC Return on 2013-07-21

Text, speed improvements:

Introduced
const float halfPi = PI / 2.0f; and
const float triHalfPi = halfPi * 3;
and used those to draw the rounded background.
Introduced
GLfloat xPlusWidth = x + width; and
GLfloat yMinusHeight = y - height;
and used those coordinates for the vertexData array.

Text, cleanup:

Declaration of local variables outside of loops.
Fixed indentation.

Approved by PS Jenkins bot, Sam Spilsbury.

3770. By MC Return on 2013-07-21

img* plugins code cleanup:

Always bail out of function ASAP, do not calculate stuff you might not need.
Declare variables outside of loops so they won't be re-declared in each loop.
Use prefix instead of postfix increments.
Declaration and assignment of variables in one line.
Merged if condition checks.
Added and removed brackets.
Added and removed newlines, if appropriate.
Minor code structure improvements, declare variables when you need them, not
much earlier.
Fixed indentation.

Approved by PS Jenkins bot, Sam Spilsbury.

3769. By MC Return on 2013-07-21

Firepaint, code cleanup:

Declare variables outside of loops.
Declaration and assignment of local variables in one line.
Use pre- instead of postfix increment.
Removed redundant newlines.
Removed redundant casts. (from (float) optionGetFireColor)
Removed redundant brackets.
Added missing break (style issue only).
Added comment and TODO.
Fixed indentation.

Firepaint, speedup:

We just enable GL_BLEND if it is disabled and
we just disable GL_BLEND if it was disabled before.

Introduced the GLfloats xMinusW, xPlusW, yMinusH and
yPlusH to store calculated coordinates instead of
recalculating them multiple times.

Introduced
float fireLife = optionGetFireLife ();,
float fireWidth = optionGetFireSize ();,
float fireHeight = fireWidth * 1.5f; and
bool mystFire = optionGetFireMystical ();
and used those variables inside the loop.

Firepaint, .xml.in cleanup:

Firepaint now has 2 tabs, 'General' and 'Particle Settings'.
The name of this plugin is Firepaint, <short> should not contain
the description.
Better description of the plugin.
Uppercase option titles.
Punctuation for tooltips.
Improved tooltips.

Firepaint, fixes:

Initialize all class member variables in the ParticleSystem::
ParticleSystem () ctor (LP: #1101512, LP: #1101580). Fixes: https://bugs.launchpad.net/bugs/1101512, https://bugs.launchpad.net/bugs/1101580.

Approved by PS Jenkins bot, Sam Spilsbury.

3768. By MC Return on 2013-07-21

src/session.cpp cleanup:

Declaration and assignment of local variables in one line.
(this *should* fix bug #1101405)
Use pre- instead of postfix increments.
Added and removed newlines.
Added missing break (just a style issue).
Fixed indentation.

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

Approved by PS Jenkins bot, Sam Spilsbury.

3767. By BryanFRitt on 2013-07-21

Fixed the non-working Annotate 'Clear' Button.
Moved this option's CCSM position upwards to keep
the button shortcuts together.

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

Approved by PS Jenkins bot, MC Return.