Merge lp:~mc-return/compiz/compiz.merge-fix1042132-missing-text-transparency into lp:compiz/0.9.9
Proposed by
MC Return
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | 3437 |
Merged at revision: | 3438 |
Proposed branch: | lp:~mc-return/compiz/compiz.merge-fix1042132-missing-text-transparency |
Merge into: | lp:compiz/0.9.9 |
Diff against target: |
31 lines (+7/-0) 1 file modified
plugins/text/src/text.cpp (+7/-0) |
To merge this branch: | bzr merge lp:~mc-return/compiz/compiz.merge-fix1042132-missing-text-transparency |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Approve | ||
MC Return | Needs Resubmitting | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email: mp+130486@code.launchpad.net |
Commit message
Re-added missing glEnable (GL_BLEND); and glDisable (GL_BLEND); calls to the OpenGL codepath to fix the text plugin's missing transparency.
Those got lost during the big GLES merge.
(LP: #1042132)
Description of the change
To test that it works, enable the shift-switcher and text plugins, open some windows and start the shift switcher.
Note: Workspacenames text still shows some flickering, but I am pretty sure I'll find the cause for this in the plugin workspacenames itself and it is unrelated to this fix.
Even with minor flickering this plugin now also looks much better with this fix applied.
To post a comment you must log in.
For cleaner diffs and better compatibility with backporting in future, please use the exact syntax that we had prior to GLES. See the GLES merge: bazaar. launchpad. net/~compiz- team/compiz/ 0.9.9/revision/ 3320#plugins/ text/src/ text.cpp
http://