lp:~mc-return/compiz/compiz.merge-fix1101572-and-other-ezoom-improvements

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.10 at revision 3777

Sam Spilsbury: Approve on 2013-07-22

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

Diff: 629 lines (+134/-108)

2 files modified

plugins/ezoom/ezoom.xml.in (+1/-1)
plugins/ezoom/src/ezoom.cpp (+133/-107)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1101572: Coverity UNINIT_CTOR - CID 12573 - plugins/ezoom/src/ezoom.cpp - in function: EZoomScreen::ZoomArea::ZoomArea() - Non-static class members "xtrans" and "ytrans" are not initialized in this constructor nor in any functions that it calls.

Medium

Fix Released

Link a bug report

Related blueprints

3772. By MC Return on 2013-07-21

Merged latest lp:compiz

3771. By MC Return on 2013-07-21

Multiple improvements (please see main commit message for details)

3770. By MC Return on 2013-07-21

Removed redundant whitespaces in the tooltip

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.

3766. By Sami Jaktholm on 2013-07-19

Bias the current viewport in addWindowSizeChanges.

If window is visible in the current viewport, use that viewport when
calculating geometries in addWindowSizeChanges. Otherwise the current method
is used.

This way visible windows are maximized in the current viewport.
However, offscreen windows won't jump back to the active viewport if window
maximizes by itself or addWindowSizeChanges is called for some other reason. Fixes: https://bugs.launchpad.net/bugs/776435.

Approved by PS Jenkins bot, Brandon Schaefer, Sam Spilsbury.

3765. By Sam Spilsbury on 2013-07-19

Adjust acceptance tests for the fix to LP: #1198000

  1. Always set frame extents before updating the frame
  2. Added COMPIZ_NO_CONFIGURE_BUFFER_LOCKS so that we don't have to deal
     with the delayed configure requests logic in the tests where it
     does not help
  3. Split restoredDecorationSize in to restoredDecorationBorderSize
     and restoredDecorationInputSize so that we can measure the size of
     the decoration both in terms of its visible and invisible border
  4. Wait for the default decoration properly
  5. Capture the initial geometry of the window with and without decorations
     when the window gets its first decoration. Use these values to calculate
     the size changes in the window from then on instead of its creation
     values
  6. Just flag when the window was first decorated in setWindowFrameExtents
     rather than checking if it is mapped. We only want to not resize
     the window once.

Approved by PS Jenkins bot, Sam Spilsbury, Andrea Azzarone.

3764. By Sam Spilsbury on 2013-07-18

Remove redundant src/logmessage/include/core/logmessage.h

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

Approved by PS Jenkins bot, Sam Spilsbury.

3763. By Sam Spilsbury on 2013-07-18

Don't add the frame to the toplevel stack if it hasn't been created yet.

In the event that a window is unreparented or destroyed, we usually need
to add its frame window to the toplevel window stack until the time at
which we recieve a DestroyNotify for it, as there may be incoming
ConfigureNotify events puporting to stack other windows relative to
that frame.

However, this does not apply in the case where we have not yet received
a CreateNotify for the frame window. In that case, it is not possible
for any stacking requests to be made relative to this window, so it
does not need to be added immediately. Instead, we can add it at the
time that we recieve a CreateNotify for it as a regular override
redirect window until the time that it is later destroyed.

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

Approved by PS Jenkins bot, MC Return.