Created by MC Return on 2012-10-24 and last modified on 2012-10-24
Get this branch:
bzr branch lp:~mc-return/compiz/compiz.merge-fix1068173-grid-does-not-follow-preview
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

3441. By MC Return on 2012-10-24

Check on which display your pointer is at, before calculating edges/corners for the snap preview

3440. By MC Return on 2012-10-22

Screenshot Plugin: Re-added GL_BLEND enabling and disabling calls to fix the selection rectangle not being transparent anymore.
Make sure to use GL_BLEND for the non-GLES codepath only.
Those calls got lost in r3320 (GLES merge).

(LP: #1047788). Fixes: https://bugs.launchpad.net/bugs/1047788. Approved by Timo Jyrinki.

3439. By Łukasz Zemczak on 2012-10-19

Only declare wasBlend if we're not using GLES (fixes ARM build failures). Approved by Didier Roche.

3438. By MC Return on 2012-10-19

Re-added missing glEnable (GL_BLEND); and glDisable (GL_BLEND); calls to the OpenGL codepath to fix the text plugin's missing transparency.
Those got lost during the big GLES merge.
(LP: #1042132). Fixes: https://bugs.launchpad.net/bugs/1042132. Approved by Daniel van Vugt.

3437. By Sami Jaktholm on 2012-10-19

Grid: Reset the currently handled window in the GridWindow destructor
only if the destroyed window was the handled one.

Currently completely unrelated GridWindow destruction will erase the
saved ID of the window Grid should be handling. This will break
the functionality if a GridWindow is destroyed while another window
is being dragged.

Fixes LP: #1067812 and LP: #1048855.. Fixes: https://bugs.launchpad.net/bugs/1048855, https://bugs.launchpad.net/bugs/1067812. Approved by Daniel van Vugt, MC Return.

3436. By Daniel van Vugt on 2012-10-18

Don't try to dereference NULL, which is returned by
ccsGConfIntegratedSettingReadValue when it gets unexpected data from gconf.
(LP: #1056615). Fixes: https://bugs.launchpad.net/bugs/1056615. Approved by Sam Spilsbury.

3435. By MC Return on 2012-10-18

Make sure showdesktop is loaded after unityshell.
(LP: #1067534)

fadedesktop conflicts with unityshell and showdesktop now.
showdesktop still conflicts with fadesktop, but not with unityshell anymore.

Together with the fix for Unity this allows the CCSM user to use the full functionality of the "Show Desktop" plug-in together with Unity-3d for the first time, namely sliding windows out of view to show the desktop and sliding them back in to restore the previous state.. Fixes: https://bugs.launchpad.net/bugs/1067534. Approved by Daniel van Vugt, Marco Trevisan (Treviño), Omer Akram.

3434. By Sam Spilsbury on 2012-10-18

Clean up the CMake code around the python modules and uninstalling
   - It isn't possible to build python extensions using distutils that
     link to things that we are building, because CMake provides no
     means for a custom command to depend on a library. Build them
     using CMake directly instead
   - Clean up the tests: the tests depended on having a working opengl
     and core plugin xml file and were also sensitive to xml data. Make
     a mock.xml and use that instead
   - Require ini for the compizconfig-python tests. They won't run without it
   - Fix the uninstall scripts. We were clobbering the uninstall target
     with the python uninstall targets, that is just plain wrong. Created
     a new cmake function to append custom uninstall scripts to the global
     uninstall script. Approved by Daniel van Vugt.

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.

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.