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

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp:compiz/0.9.10

Sam Spilsbury: Approve on 2013-07-15

Diff: 816 lines (+336/-138)

7 files modified

include/core/CMakeLists.txt (+1/-0)
plugins/decor/src/decor.cpp (+6/-4)
plugins/decor/tests/acceptance/xorg-gtest/compiz_decor_acceptance_tests.cpp (+297/-66)
src/logmessage/CMakeLists.txt (+0/-13)
src/logmessage/include/core/logmessage.h (+0/-51)
src/privatewindow.h (+1/-0)
src/window.cpp (+31/-4)

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

3759. By Sam Spilsbury on 2013-07-15

Fixes LP: #1067246

3758. By Sam Spilsbury on 2013-07-15

Install logmessage.h

3757. By Sam Spilsbury on 2013-07-15

Don't install files twice

3756. By Sam Spilsbury on 2013-07-15

lp:~stevenhooke11/compiz/compiz.fix_1067246

3755. By Sam Spilsbury on 2013-07-15

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

3754. By Sam Spilsbury on 2013-07-15

Merge lp:~andyrock/compiz/fix-1198000

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.