Created by MC Return on 2012-10-19 and last modified on 2012-10-19
Get this branch:
bzr branch lp:~mc-return/compiz/compiz.merge-fix1042132-missing-text-transparency
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

3437. By MC Return on 2012-10-19

Restored the wasBlend checks also

3436. By MC Return on 2012-10-19

Removed newlines

3435. By MC Return on 2012-10-19

Trying to keep the .diff cleaner

3434. By MC Return on 2012-10-19

Re-added missing glEnable (GL_BLEND); and glDisable (GL_BLEND); calls to fix the text plugin's missing transparency.

3433. By Sami Jaktholm on 2012-10-17

The grid resize hint overlay doesn't disappear when the window is
moved along the edge from a region that has a resize action set to a
region without one (LP: #839602).

When the edge changes, grid calculates the target rectangle for the
transformation. The previous overlay will be destroyed only if the
new target rectangle is different from the previous target rectangle.
But when the target is GridUnknown (the action for the region has set
to be None), initiateCommon bails out right away leaving the target
rectangle unchanged. And thus grid thinks nothing has changed and
the old overlay is left intact.

The fix resets the target rectangle to be at (0, 0) with height and
width of 0. As the previous rectangle is now different from the new
one, the old overlay will fade out. The same technique is used to
destroy the overlay when the window is moved away from the target region.. Fixes: https://bugs.launchpad.net/bugs/839602. Approved by Daniel van Vugt, Sam Spilsbury.

3432. By Daniel van Vugt on 2012-10-17

Make core extern std templates compatible with C++0x projects like Unity.
(LP: #1067598)
. Fixes: https://bugs.launchpad.net/bugs/1067598. Approved by Brandon Schaefer.

3431. By Brandon Schaefer on 2012-10-17

Fix grid build failure (LP: #1067577). Fixes: https://bugs.launchpad.net/bugs/1067577. Approved by Daniel van Vugt.

3430. By Daniel van Vugt on 2012-10-16

Restore cube transparency support for the top and bottom faces. It got
deleted as part of the GLES merge (r3320) in
(LP: #1048272)
. Fixes: https://bugs.launchpad.net/bugs/1048272. Approved by Sam Spilsbury, PS Jenkins bot, MC Return.

3429. By Daniel van Vugt on 2012-10-16

Remove dead code (unused subtypes). Approved by Sam Spilsbury.

3428. By Daniel van Vugt on 2012-10-16

Ensure template instances relating to CompRect are only instantiated in core
and never in any plugin.
(LP: #1067219)
. Fixes: https://bugs.launchpad.net/bugs/1067219. Approved by Sam Spilsbury, PS Jenkins bot.

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.