lp:~mc-return/compiz/compiz.merge-fix1116538-isgridresized-windows-do-not-react-to-strg-super-down.2

Created by MC Return and last modified
Get this branch:
bzr branch lp:~mc-return/compiz/compiz.merge-fix1116538-isgridresized-windows-do-not-react-to-strg-super-down.2
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

Owner:
MC Return
Project:
Compiz
Status:
Merged

Recent revisions

3652. By MC Return

Simplified bool GridScreen::restoreWindow (...):
If Grid has not touched the window we return false and let core do the
dirty work (Thanks go to Sam Spilsbury for suggesting this solution)

Improved the CCSM Grid put_restore_key tooltip

3651. By MC Return

*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
pixel.

Enhanced and corrected a few tooltips.

*Resizeinfo, 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.

Declaration and assignment of local variables in one line, if possible.

Minor indentation fixes.

(LP: #1166195, LP: #1166196 and LP: #1166245). Fixes: https://bugs.launchpad.net/bugs/1166195, https://bugs.launchpad.net/bugs/1166196, https://bugs.launchpad.net/bugs/1166245.

Approved by PS Jenkins bot, Sam Spilsbury.

3650. By Sami Jaktholm

*Grid code:

Prevent center and corner gridded windows from jumping viewports.
(Thanks and credits for this go to Sami Jaktholm)

Prevent top and bottom gridded windows from jumping viewports by
making those semi-maximize horizontally.

As those are actually semi-maximized horizontally, we will treat
them as such and let core handle the restoring, just like we
already do for vertically semi-maximized grid windows (left/right).

Now "Strg+Super+Down" will restore top and bottom gridded windows
correctly as well.

Also multiple gridding to top, bottom, left or right will not
overwrite the stored original size anymore.

Restore windows also when workspace switcher (expo) is active.
(Thanks and credits for this go to Sami Jaktholm)

Allow cycling for all gridded windows if explicitly specified by the
user in CCSM.

Forbid cycling through different sizes for corner and center-gridded
windows also per default, now fully fixing bug #878820 and following
the design specification by Ayatana Design there, making behaviour
consistent.

Introduced 3 new bools:
horzMaximizedGridPosition,
vertMaximizedGridPosition,
anyMaximizedGridPosition

Used these bools inside the if condition checks.
Simplified complicated if condition by removing redundant additional
size check.

Cleanup all around.

*Grid xml:

Added cycle_sizes bool option, which allows the user to choose the
prefered behaviour (fixed versus flexible sizes on multiple presses
on the same grid keyboard shortcut).
Default of this option is off, cycling disabled as specified by design.

Added punctuation where missing and removed it where usually is none.
Fixed typos, improved description and titles.

*Expo code:
Tell grid when viewport change is in progress.
(Thanks and credits for this go to Sami Jaktholm)

(fixes: LP: #878820, LP: #879218, LP: #882754 and LP: #1082001,
 partially fixes: #1116538, #1164332). Fixes: https://bugs.launchpad.net/bugs/878820, https://bugs.launchpad.net/bugs/879218, https://bugs.launchpad.net/bugs/882754, https://bugs.launchpad.net/bugs/1082001, https://bugs.launchpad.net/bugs/1116538, https://bugs.launchpad.net/bugs/1164332.

Approved by PS Jenkins bot, Sami Jaktholm, Sam Spilsbury.

3649. By Ɓukasz Zemczak

Qt is stupid since it uses the stupid X11 protocol - let's not set all the attributes (especially override_redirect) every time, only in cases when it's actually needed (LP: #1141079). Fixes: https://bugs.launchpad.net/bugs/1141079.

Approved by PS Jenkins bot.

3648. By MC Return

Stack (Window) Switcher
(currently excluded from compilation):

Fixed window title drawn although "Show Window Title" is disabled.

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

Approved by PS Jenkins bot, Sam Spilsbury.

3647. By MC Return

Cube-addon (Cube Reflection and Deformation):

If the user disables "Draw top face"/"Draw bottom face"
we do not want to draw anything (LP: #1162484).

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

We need to clear the texture if no texture files are
specified in "Image files", otherwise the old texture
would still be drawn, even if all image files are
removed (LP: #1162711).

Now we will default back and use the cube cap
colors and opacities defined in the "Desktop Cube" plugin
(if "Draw top/bottom face" are enabled only, see above).

This way the user can choose between (for top/bottom):

1. Do not draw a cube cap face at all
   ("Draw top/bottom face" option disabled)
2. Use color and opacity specified in "Desktop Cube"
   (empty images list)
3. Use a texture for the cap
   (image is in the list, which is default)

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.

Fixed indentation, removed redundant brackets and newlines,
declaration and assignment of local variables in one line,
if possible, minor cleanup.

(LP: #1162484, LP: #1162711). Fixes: https://bugs.launchpad.net/bugs/1162484, https://bugs.launchpad.net/bugs/1162711.

Approved by PS Jenkins bot, Sam Spilsbury.

3646. By Steve Langasek

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

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

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

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.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:compiz/0.9.10
This branch contains Public information 
Everyone can see this information.

Subscribers