Compiz

Merge lp://staging/~mc-return/compiz/compiz.merge-fix1009999-shiftswitcher-ignores-setting-show-window-title into lp://staging/compiz/0.9.9

compiz.merge-fix1009999-shiftswitcher-ignores-setting-show-window-title
Merge into 0.9.9

Proposed by MC Return on 2012-10-24

Status:

Merged

Approved by:

Sam Spilsbury on 2012-11-01

Approved revision:

3441

Merged at revision:

3445

Proposed branch:

lp://staging/~mc-return/compiz/compiz.merge-fix1009999-shiftswitcher-ignores-setting-show-window-title

Merge into:

lp://staging/compiz/0.9.9

Diff against target:

39 lines (+12/-6)

1 file modified

plugins/shift/src/shift.cpp (+12/-6)

To merge this branch:

bzr merge lp://staging/~mc-return/compiz/compiz.merge-fix1009999-shiftswitcher-ignores-setting-show-window-title

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Sam Spilsbury		2012-10-24	Approve on 2012-11-01
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2012-10-31
Daniel van Vugt			Approve on 2012-10-31
Review via email: mp+131148@code.staging.launchpad.net

Commit message

"Show Window Title" was always rendered, CCSM settings to disable the window title were ignored. Fixed this by adding checks to ShiftScreen::drawWindowTitle.

Minor optimization in ShiftScreen::renderWindowTitle: Do not create variables and call freeWindowTitle (), if the text plug-in is not available or window title rendering is disabled.

(LP: #1009999)