lp:~mc-return/compiz/compiz.merge-fix1166195-fix1166196-fix116245-resizeinfo-fixes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.10 at revision 3651

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

Sam Spilsbury: Approve on 2013-04-09

Diff: 384 lines (+90/-74)

3 files modified

plugins/resizeinfo/resizeinfo.xml.in (+19/-7)
plugins/resizeinfo/src/resizeinfo.cpp (+66/-62)
plugins/resizeinfo/src/resizeinfo.h (+5/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1166195: Resizeinfo: Damage rectangle calculation is broken, popup_size+window_size are used	Medium	Fix Released
Bug #1166196: Resizeinfo: Wishlist: No option to disable bold text/number rendering, no options to change font size	Wishlist	Fix Released
Bug #1166245: Resizeinfo: Current RESIZE_POPUP_WIDTH and RESIZE_POPUP_HEIGHT numbers are not ideal for text display of "XXXX x XXX"	Low	Fix Released

Link a bug report

Related blueprints

3647. By MC Return on 2013-04-08

Resizeinfo:

.xml changes:
Added option for bold/normal font, default is still bold

Added option to change the font size (10-14), default is still 12

Enhanced a few tooltips

Code changes:
Choose between PANGO_WEIGHT_BOLD and PANGO_WEIGHT_NORMAL

Use individual font size specified by the user in CCSM

Fixed computation of wrong damageRegion, it was additionally adding
the window size, making it way too large

Removed useless declaration of int width and height

Declare and assign local variables in one line, if possible

Minor indentation fixes

3646. By Steve Langasek on 2013-04-07

Fix for bug #763148 (with added test cases): when the desktop is resized,
windows should stay on their original workspace. Fixes: https://bugs.launchpad.net/bugs/763148.

Approved by PS Jenkins bot, Sam Spilsbury.

3645. By Gabriel Ebner on 2013-04-03

Adding a uniform to a GLVertexBuffer that uses AutoProgram causes compiz to segfault.

Example:
  gWindow->addShaders("cms", "", fragment_shader);
  gWindow->vertexBuffer()->addUniform("cms_lut", unit);
  // segfault happens later in PrivateVertexBuffer::render

The patch modifies PrivateVertexBuffer::render to set the uniform on the generated AutoProgram instead of the provided program, which in this case is NULL, causing a segfault.

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

Approved by PS Jenkins bot, Sam Spilsbury.

3644. By MC Return on 2013-04-03

Hopefully fixed all memory leaks in libcompizconfig.
Minor whitespace fixes.

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

Approved by PS Jenkins bot, Sam Spilsbury.

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.

3638. By Hu Kang <email address hidden> on 2013-03-27

put: Don't resize the option vector every time PutScreen::toViewport is called - this will leave stale values in the option vector. Instead, check if the option exists already and resize the vector that.

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

Approved by PS Jenkins bot, Sam Spilsbury.