lp:~mc-return/compiz/compiz.merge-fix1162484-original-cube-top-and-bottom-caps-not-deformed

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.10 at revision 3647

PS Jenkins bot (community): Approve (continuous-integration) on 2013-04-08

Sam Spilsbury: Approve on 2013-04-08

Daniel van Vugt: Pending requested 2013-04-04

MC Return: Pending requested 2013-04-04

Diff: 445 lines (+85/-98)

1 file modified

plugins/cubeaddon/src/cubeaddon.cpp (+85/-98)

api

Superseded for merging into lp:compiz/0.9.9

Daniel van Vugt: Needs Resubmitting on 2013-04-02

Diff: 235 lines (+44/-48)

1 file modified

plugins/cubeaddon/src/cubeaddon.cpp (+44/-48)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1162484: Cube Addon: Original cube top and bottom caps are not deformed but still painted	Medium	Fix Released
Bug #1162711: Deleting cube caps image files does not clear the texture, it still gets painted	Medium	Fix Released

Link a bug report

Related blueprints

3648. By MC Return on 2013-04-03

Additional cleanup

3647. By MC Return on 2013-04-02

Moved the mFiles.size () check to CubeaddonScreen::CubeCap::load (...)

Removed redundant mCurrent = mCurrent % mFiles.size (); calculation,
this has already been done:
cap->mCurrent = (cap->mCurrent + change + count) % count;

count and change both need to be != 0 for mCurrent to change

3646. By MC Return on 2013-04-02

cScreen->damageScreen (); once the cap has been changed
(reverted removal)

3645. By MC Return on 2013-04-01

If the user disables "Draw top face"/"Draw bottom face"
we do not want to draw anything

The original, non-deformed caps will only work for the
non-deformed cube, so we can just use it in that case

We need to clear the texture if no texture files are
specified

void CubeaddonScreen::CubeCap::load is just called by
CubeaddonScreen::changeCap, where cap->mFiles.size ()
is already checked, no need to check it again

Fixed indentation

Removed redundant brackets and newlines

3644. By MC Return on 2013-03-31

Cube-addon:
Only call cubeScreen->cubePaintBottom if there is no deformation
Declare and assign variables in one line, if possible
Minor cleanup

3643. By MC Return on 2013-03-30

Workspacenames:

Damage the text area correctly.
Extract the method used to determine where the text area was
into a separate function and use that to determine where our
damage area should be.
Also fix a few errors that happened on the last frame of animation.

This also fixes the flickering during display.

Other minor code refactoring.

(LP: #1075578, LP: #1162246). Fixes: https://bugs.launchpad.net/bugs/1075578, https://bugs.launchpad.net/bugs/1162246.

Approved by PS Jenkins bot, Sam Spilsbury.

3642. By MC Return on 2013-03-30

Show Desktop Upgrade:

Renamed "Show desktop" to "Show Desktop" (uppercase).

New features:

* Added individual movement options for all 4 corners.

* Implemented the new movement direction option "Intelligent Random".
  This option will make windows slide out of view in one of 3
  random directions (Top/Bottom / Left/Right / ToCorners) using the
  shortest movement distance, when Show Desktop is invoked.

* Also implemented a "Fully Random" movement direction mode, which will
  move every window out of view using one of 8 randomly chosen directions
  (one of 4 corners or one of 4 edges of the virtual screen).

enum IRDirection represents allowed directions in Intelligent Random
Direction mode, while enum FRDirection represents allowed directions
in Fully Random Direction mode.

Refactored ShowdesktopPlacer:
1. Removed #define macros and replaced them with inline functions in ::.
2. Refactored out the offset algorithms into separate functions.
3. Placed the actual offset + setting algorithms into ShowdesktopPlacer
and re-used where appropriate. This reduces the size of
ShowdesktopWindow::repositionPlacer.

Simplified void ShowdesktopScreen::donePaint () and removed redundant
damageScreen () call.

Removal of redundant brackets, declaration and assignment of variables in
the same line, indentation fixes, readability improvements and general
cleanup.

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

Approved by PS Jenkins bot, MC Return.

3641. By MC Return on 2013-03-30

Grid:
Fixed completely broken indentation.
Declaration and assignment of variables in one line.
Removed redundant brackets.

Approved by PS Jenkins bot, Sam Spilsbury.

3640. By MC Return on 2013-03-28

wall.cpp:
Removed redundant check if (screen->otherGrabExist ("wall", 0)) in
bool WallScreen::initiateFlip (Direction direction, CompAction::State state),
because this check is already done a few lines earlier.

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

Approved by PS Jenkins bot, Sam Spilsbury.

3639. By MC Return on 2013-03-27

Removed empty and redundant CompWindow::syncPosition () function
and all calls to it.
Also removed some associated variables not needed anymore.

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

Approved by PS Jenkins bot, Sam Spilsbury.