Created by MC Return on 2013-07-21 and last modified on 2013-07-21
Get this branch:
bzr branch lp:~mc-return/compiz/compiz.merge-fix284158-cube-rotate-eats-mouse-clicks-on-side-of-screen
Only MC Return can upload to this branch. If you are MC Return please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

MC Return

Recent revisions

3773. By MC Return on 2013-07-21

Minor improvements:
No need to negate, added name of the bool

3772. By Matija Skala on 2013-07-21

Rotate cube plugin:
Do not eat mouse clicks on the sides of the screen

(LP: #284158) !!!

3771. By MC Return on 2013-07-21

Text, speed improvements:

const float halfPi = PI / 2.0f; and
const float triHalfPi = halfPi * 3;
and used those to draw the rounded background.
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.

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
  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.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.