Mir

Merge lp:~vanvugt/mir/black-background into lp:~mir-team/mir/trunk

  1. black-background
  2. Merge into trunk
Proposed by Daniel van Vugt
Status: Merged
Approved by: Gerry Boland
Approved revision: no longer in the source branch.
Merged at revision: 997
Proposed branch: lp:~vanvugt/mir/black-background
Merge into: lp:~mir-team/mir/trunk
Diff against target: 10 lines (+0/-1)
1 file modified
src/server/compositor/gl_renderer.cpp (+0/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/black-background
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Gerry Boland (community) Approve
Robert Ancell Approve
Review via email: mp+181506@code.launchpad.net

Commit message

Revert the grey background. It's too visually intrusive while we don't yet
have the ability to give a shell any control over compositing (and override
GLRenderer::clear) like it should eventually have. (LP: #1215322)

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Sure. I kind of liked it though :)

review: Approve
Revision history for this message
Gerry Boland (gerboland) wrote :

Thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:995
http://jenkins.qa.ubuntu.com/job/mir-ci/1353/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1811
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1696
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/591
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/591/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1353/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/server/compositor/gl_renderer.cpp'
2--- src/server/compositor/gl_renderer.cpp 2013-08-19 07:05:48 +0000
3+++ src/server/compositor/gl_renderer.cpp 2013-08-22 09:40:41 +0000
4@@ -279,7 +279,6 @@
5
6 void mc::GLRenderer::clear()
7 {
8- glClearColor(0.3f, 0.3f, 0.3f, 1.0f);
9 glClear(GL_COLOR_BUFFER_BIT);
10 }
11

Subscribers

People subscribed via source and target branches