Created by MC Return on 2013-07-06 and last modified on 2013-07-21
Get this branch:
bzr branch lp:~mc-return/compiz/compiz.merge-cubeaddon-improvements
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

3757. By MC Return on 2013-07-21

Merged latest lp:compiz

3756. By MC Return on 2013-07-21

Added missing whitespace
Renamed csDistance and csDistanceSquared to cubeDistance and
NULL-initialized the GLVertexBuffer *streamingBuffer pointer
Renamed oWidth and oHeight to outputWidth and outputHeight

3755. By MC Return on 2013-07-06

Introduced GLfloat gSY = static_cast <GLfloat>(groundSize - 0.5f); and
used this variable in the assignment of the ground2Vertices[] array
Introduced GLfloat halfV = v / 2.0f; and used this variable in the
assignment of the GLfloat vertices[] array
Added missing whitespace
Reverted alignment in the ctor

3754. By MC Return on 2013-07-06

Cubeaddon, multiple improvements
(please see main commit message for details)

3753. By MC Return on 2013-07-02

Fixed vertical alignment of the text on the stylized keys.
(Shift, Super, Ctrl, Alt)

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

Approved by Brandon Schaefer, PS Jenkins bot.

3752. By MC Return on 2013-07-02

Fixed broken text in all plugins (missing COMPIZ_TEXT_ABI).
(LP: #1196493). Fixes: https://bugs.launchpad.net/bugs/1196493.

Approved by Brandon Schaefer, PS Jenkins bot.

3751. By Sam Spilsbury on 2013-07-01

Unrevert 3728, fix failing tests.

Change the behaviour of undecorating windows.

Previously when a window was undecorated, we would shift it back to an appropriate position according to its gravity member. That behaviour was problematic because in the StaticGravity case the window has to just stay in the same place. But then if you had a window with StaticGravity which then did get a decoration and later removed it, it would be placed as though it was decorated and appear to be in the wrong place.

The correct behaviour is to place all windows as though they have decorations, and then when decorations are removed, to move the window back to the corner as indicated in its gravity and then expand its size to cover the obscured regions no longer hidden because the decorations went away.

(LP: #1165343).

  1. Completely remove decorOffsetMove and other related code from
     decor.cpp. Put the logic to handle the window->input () - window->border ()
     placement offset inside of setWindowFrameExtents instead. Now the window
     will always be offset from its original non-decorated position to the new
     decorated position, rather than having to guess between decoration sizes.
  2. Make saveGeometry and restoreGeometry work relative to window->border ()
     as opposed to including it in the saved geometry. It is possible that the
     border size might change during maximization, as such, we don't want to
     save the position with the border before maximizing. Instead save the position
     as if it were never decorated so that when the window is restored it can be
     restored to its original position and then adjusted for its new border size.
  3. Fix a few typoes in the tests.
  4. Moved some commonly used matchers into compiz::testing
  5. Make COMPIZ_PLUGIN_DIR accept multiple directories and look in each one
     of them for the plugin
  6. Set COMPIZ_PLUGIN_DIR appropriately for each plugin that we wish to load
     on startup so that we load locally built plugins as opposed to installed
  7. Uncomment compiz_discover_tests for the acceptance tests. Now they are
     run by default.

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

Approved by PS Jenkins bot, MC Return, Brandon Schaefer.

3750. By MC Return on 2013-06-28

Simplified the GL filter handling.

Approved by PS Jenkins bot, Sam Spilsbury.

3749. By MC Return on 2013-06-28

Fixed mousepoll version mismatch.

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

Approved by PS Jenkins bot, Łukasz Zemczak.

3748. By MC Return on 2013-06-28

Added contribute directory.
Added QtCreatorConfig.xml, a configuration file for Qt Creator, which
adjusts Qt Creator's C++ indentation style to be the same that is used
in the Compiz project (X11, mixed spaces and tabs).

Approved by PS Jenkins bot, MC Return.

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.