Merge lp://staging/~mc-return/compiz/compiz.merge-fix1116538-isgridresized-windows-do-not-react-to-strg-super-down.2 into lp://staging/compiz/0.9.10
| Status: | Merged |
|---|---|
| Approved by: | Sam Spilsbury |
| Approved revision: | 3652 |
| Merged at revision: | 3663 |
| Proposed branch: | lp://staging/~mc-return/compiz/compiz.merge-fix1116538-isgridresized-windows-do-not-react-to-strg-super-down.2 |
| Merge into: | lp://staging/compiz/0.9.10 |
| Diff against target: |
38 lines (+6/-10) 2 files modified
plugins/grid/grid.xml.in (+1/-1) plugins/grid/src/grid.cpp (+5/-9) |
| To merge this branch: | bzr merge lp://staging/~mc-return/compiz/compiz.merge-fix1116538-isgridresized-windows-do-not-react-to-strg-super-down.2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Sam Spilsbury | Approve | ||
| MC Return | Needs Resubmitting | ||
|
Review via email:
|
|||
Commit message
*Grid code:
Simplified bool GridScreen:
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.)
*Grid xml:
Improved the CCSM Grid put_restore_key tooltip.
(LP: #1116538)
Description of the change
I had to make a new branch and MP for this.
Sam, I've implemented your solution now.
The user will still have to change the shortcut though...
We should probably change the Grid default to be the
same like the unmaximize_
and via quilt patch adjust it to be "Strg+Super+Down"
in Ubuntu (like the unmaximize_
But this can be done another day as well...
Note also:
I have now removed the responsibility for fully maximized
Grid windows from Grid as well... (see the diff)
As core knows how to handle the restoring of semi-maximized
windows, we could remove that also - but should do so
after we've harmonized the shortcuts...
| MC Return (mc-return) wrote | # |
| Sam Spilsbury (smspillaz) | # |
| Sam Spilsbury (smspillaz) wrote | # |
| Sam Spilsbury (smspillaz) | # |
| PS Jenkins bot (ps-jenkins) | # |
The only problem we have with this solution is -
we have to make sure that the shortcuts are harmonized...
That is why I would propose a combination of this with
optional enhancement of Grid, so the user can choose
to also use Grid to restore, or restore and minimize,
if the Grid restore shortcut is not harmonized with
core...
That way we could make everyone happy and would give
users the possibility to use a different shortcut for
Grid restore than core uses for
unmaximize/
We should IMHO find a perfect solution, without any
compromises...