lp:~mc-return/compiz/compiz.merge-fix1082001-gridded-windows-jump-workspaces

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.10 at revision 3650

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

Sami Jaktholm (community): Approve on 2013-04-09

Sam Spilsbury: Approve on 2013-04-09

MC Return: Pending requested 2013-04-09

Diff: 739 lines (+219/-88)

4 files modified

plugins/expo/src/expo.cpp (+6/-0)
plugins/grid/grid.xml.in (+31/-26)
plugins/grid/src/grid.cpp (+180/-61)
plugins/grid/src/grid.h (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #878820: Window Management, Keyboard shortcut - The grid keybindings are behaving inconsistently	High	Fix Released
Bug #879218: some users prefer the old grid behaviour (dividing each time the keybinding are used)	Wishlist	Fix Released
Bug #882754: Switching to another viewport using "expo plugin" after adjusted a window to one corner with "grid plugin" fails	High	Fix Released
Bug #1082001: Grid/Expo: Corner-, top-, bottom- and center-resized Grid windows confuse Expo and follow the user from workspace to workspace	High	Fix Released
Bug #1116538: Strg + Super + Down does not work for windows placed in corners or top/bottom half	Medium	Fix Released
Bug #1164332: Grid: multiple keyboard-gridding of the same window to the same position will overwrite the stored original size	High	Fix Released

Link a bug report

Related blueprints

3661. By MC Return on 2013-04-09

Merged latest lp:compiz

3660. By MC Return on 2013-04-09

Merged Grid from latest lp:compiz

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)

Improved the CCSM grid restore tooltip

3659. By MC Return on 2013-04-09

Grid xml:
Improved tooltip for the "put_restore_key" reflecting it's enhanced
functionality.

3658. By MC Return on 2013-04-07

Grid:
We want to use the same functionality like the unmaximize_or_minimize_window
shortcut normally provides, so if our window has not been touched by grid, we
will do the same with that window that core would normally do
(see src/actions.cpp, unmaximizeOrMinimizeWin and
 launchpad bug LP: #1116538 for details)

Note: If we use the same shortcut for unmaximize_or_minimize_window_key (core)
and put_restore_key (grid) core will take over again, if grid gets disabled
If grid is enabled the unmaximize_or_minimize_window_key will be overridden,
because core always loads first and grid later

Also note that this commit did not change any shortcut yet, but just provides
the functionality for grid - Please use your grid restore keybinding like you
would use the unmaximize_or_minimize_window_key normally to test

3657. By MC Return on 2013-04-07

Reverted r3652 as this change to the move plugin is not tightly related
to this branch and thus will be proposed seperately to reduce diff size
here

3656. By MC Return on 2013-04-06

Allow cycling through different sizes for top/bottom and left/right
gridded windows as well, if the user specified it in CCSM explicitely
(default is off)

3655. By MC Return on 2013-04-06

plugins/grid/grid.xml.in:

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

grid:

Allow cycling for corner/center gridded windows if specified by the
user

3654. By MC Return on 2013-04-06

Simplified the condition check to bail out if the last target was the
same like the current one to prevent corner and centered windows from
cycling through sizes

3653. By MC Return on 2013-04-06

Grid:
Forbid cycling through different sizes for corner and center-gridded
windows also, now fully fixing bug #878820 and following the design
specification for now

TODO: Make the behaviour configurable for the user as many prefer
cycling through different sizes

Added comment
Minor whitespace fixes
Declare CompOutput out and assign a value to it in one line

3652. By MC Return on 2013-04-05

move:
Implemented strategy to snap off horizontally semi-maximized windows