Merge lp:~mc-return/compiz/compiz.merge-fix1173684-ring-switcher-needs-vertical-text-offset-option-also into lp:compiz/0.9.10
| Status: | Merged |
|---|---|
| Approved by: | Sam Spilsbury |
| Approved revision: | 3693 |
| Merged at revision: | 3701 |
| Proposed branch: | lp:~mc-return/compiz/compiz.merge-fix1173684-ring-switcher-needs-vertical-text-offset-option-also |
| Merge into: | lp:compiz/0.9.10 |
| Diff against target: |
1089 lines (+250/-265) 2 files modified
plugins/ring/ring.xml.in (+9/-2) plugins/ring/src/ring.cpp (+241/-263) |
| To merge this branch: | bzr merge lp:~mc-return/compiz/compiz.merge-fix1173684-ring-switcher-needs-vertical-text-offset-option-also |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Sam Spilsbury | Approve | ||
|
Review via email:
|
|||
Commit message
*Ring Switcher, new feature:
Implemented "Vertical Offset" option with a default of 50 pixels.
This allows the CCSM user to easily and exactly configure where the
window title text should be displayed.
Ring Switcher, cleanup:
Simplified RingWindow:
Bail out of functions ASAP, do not initialize anything you do not need,
if you exit anyway.
Merged if condition checks.
Declaration and assignment of local variables in one line.
Removed redundant brackets.
Added and removed newlines, if appropriate.
Fixed indentation.
(LP: #1173684)
Description of the change
Note:
The additional option is exactly analogue to:
https:/
Note 2:
I apologize for mixing the cleanup with the additional feature here, it happened because I thought the Ring Switcher code was already cleaned up in trunk, but just the .xml was...
| Sam Spilsbury (smspillaz) | # |
| PS Jenkins bot (ps-jenkins) | # |
