lp:~compiz-team/compiz/compiz.fix_1067246.1

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.10 at revision 3764

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

Sam Spilsbury: Approve on 2013-07-15

Diff: 100 lines (+1/-64)

3 files modified

include/core/CMakeLists.txt (+1/-0)
src/logmessage/CMakeLists.txt (+0/-13)
src/logmessage/include/core/logmessage.h (+0/-51)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1067246: Duplicate files: include/core/logmessage.h == src/logmessage/include/core/logmessage.h

Low

Fix Released

Link a bug report

Related blueprints

3756. By Sam Spilsbury on 2013-07-15

Don't install file in the wrong place

3755. By Sam Spilsbury on 2013-07-15

Merge lp:~stevenhooke11/compiz/compiz.fix_1067246

3754. By Sam Spilsbury on 2013-07-15

Merge lp:compiz

3753. By MC Return on 2013-07-02

CCSM:
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
     ones.
  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

Expo:
Simplified the GL filter handling.

Approved by PS Jenkins bot, Sam Spilsbury.

3749. By MC Return on 2013-06-28

Mousepoll:
Fixed mousepoll version mismatch.
(COMPIZ_MOUSEPOLL_ABI was missing)

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

3747. By MC Return on 2013-06-27

Expo, .xml.in fixes:

Better description of the plugin.
Improved and fixed tooltips.
Moved the "Curve Strength" option closer to "Deformation".

Refreshed the quilt patch for Ubuntu:
There is no need to set the default distance to 0.005 as this setting
has no effect without deformation.
Set default multi-screen mode to "One wall per output" for Ubuntu,
because "One big wall" works now for all display configurations and
could potentially change the appearance for Ubuntu users.

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

Approved by Didier Roche, PS Jenkins bot.