lp:~mc-return/compiz/compiz.merge-annotate-cleanup

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.10 at revision 3714

PS Jenkins bot (community): Approve (continuous-integration) on 2013-05-17

Sam Spilsbury: Approve on 2013-05-17

MC Return: Needs Resubmitting on 2013-05-15

Diff: 911 lines (+269/-271)

2 files modified

plugins/annotate/src/annotate.cpp (+201/-204)
plugins/annotate/src/annotate.h (+68/-67)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3706. By MC Return on 2013-05-15

Merged latest lp:compiz

3705. By MC Return on 2013-05-15

Use GL_LINE_LOOP to draw the rectangle outline as glRecti is not supported (GLES)
Simplified the coordinate calculation as the offset is not really needed here
Minor indentation fixes

3704. By MC Return on 2013-05-15

Annotate plugin, code cleanup (please see main commit message for details)

3703. By MC Return on 2013-05-14

Scale Addons code cleanup:

Always bail out of functions ASAP, do not calculate unnecessary stuff before.
Merged if-condition checks.
Declaration and assignment of local variables in one line.
Reduced the scope of some variables.
Use pre- instead of postfix in- and decrements.
Added and removed newlines where appropriate.
Added brackets to foreach macro loops and removed them otherwise (if redundant).
Fixed indentation.

Note:
This plugin has a huge chunk of code, which has been commented out.
(apparantly/according to the comment, because it does not work)
I was very cautious in refactoring this part of the code, as it currently is
excluded from compilation and thus cannot be tested.

TODO: Test, repair and integrate this code (or remove it if it is redundant).

TODO: Fix half-broken "Exit Scale On Pull".

TODO: Fix the scale-will-only-terminate-if-initiate_key-is-defined bug.

Approved by PS Jenkins bot, Sam Spilsbury.

3702. By MC Return on 2013-05-14

gtk/*, include/*, kde/*:
Use prefix instead of postfix de- and increments.

Approved by PS Jenkins bot, Sam Spilsbury.

3701. By MC Return on 2013-05-14

*Ring Switcher, new feature:

Implemented "Vertical Offset" option with a default of 50 pixels.
This allows the CCSM user to easily and exactly configure where the
window title text should be displayed.

Ring Switcher, cleanup:

Simplified RingWindow::compareRingWindowDepth (...).
Bail out of functions ASAP, do not initialize anything you do not need,
if you exit anyway.
Merged if condition checks.
Declaration and assignment of local variables in one line.
Removed redundant brackets.
Added and removed newlines, if appropriate.
Fixed indentation.

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

Approved by PS Jenkins bot, Sam Spilsbury.

3700. By MC Return on 2013-05-14

compizconfig/*, libdecoration/*:
Use prefix instead of postfix de- and increments.

Approved by PS Jenkins bot, Sam Spilsbury.

3699. By MC Return on 2013-05-14

Expo plugin:
Fixed inactive viewports saturation setting being ignored.
Let's "fade to grey"... :)

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

Approved by PS Jenkins bot, Sam Spilsbury.

3698. By Marco Trevisan (Treviño) on 2013-05-13

OpenGL Screen: Ignore the MSAA configs during initialization

This fixes a crash with new MESA drivers and high monitor resolutions
caused by the fact that we're accidentally using some MSAA configs with
some drivers in Mesa 9.0.
Taking in account the values of GLX_SAMPLES and GLX_SAMPLE_BUFFERS
fixes the issue.

See mesa bug https://bugs.freedesktop.org/show_bug.cgi?id=61182. Fixes: https://bugs.launchpad.net/bugs/1174495.

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

3697. By MC Return on 2013-05-13

Removed redundant Expo configuration changes from ubuntu-config.patch:

The reflection scale change, because reflection is disabled by default anyway.

The inactive viewport saturation change from 100.0% to 40.0%, because this
option does not work (and never did AFAICR), but if it finally gets fixed
Expo's look would dramatically change.

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

Approved by PS Jenkins bot, Sam Spilsbury.