Compiz

Merge lp:~compiz-team/compiz/lp-1362005 into lp:compiz/0.9.12

  1. lp-1362005
  2. Merge into 0.9.12
Proposed by Stephen M. Webb
Status: Merged
Approved by: Brandon Schaefer
Approved revision: 3890
Merged at revision: 3895
Proposed branch: lp:~compiz-team/compiz/lp-1362005
Merge into: lp:compiz/0.9.12
Diff against target: 28 lines (+3/-1)
1 file modified
plugins/ezoom/src/ezoom.cpp (+3/-1)
To merge this branch: bzr merge lp:~compiz-team/compiz/lp-1362005
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+239224@code.launchpad.net

Commit message

Forces non-opaque pointer in the ezoom plugin.

Description of the change

Forces non-opaque pointer in the ezoom plugin.

The ezoom plugin was not explicitly setting the rendering attributes of the cursor, which could cause it to arbitrarily render as transparent under sme circumstances. This change forces full opacity at all times.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3890
http://jenkins.qa.ubuntu.com/job/compiz-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-utopic-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-utopic-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/1/rebuild

review: Approve (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/ezoom/src/ezoom.cpp'
2--- plugins/ezoom/src/ezoom.cpp 2013-07-21 22:14:38 +0000
3+++ plugins/ezoom/src/ezoom.cpp 2014-10-22 16:04:43 +0000
4@@ -1164,6 +1164,7 @@
5 GLfloat textureData[8];
6 GLfloat vertexData[12];
7 GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
8+ const GLWindowPaintAttrib attrib = { OPAQUE, BRIGHT, COLOR, 0, 0, 0, 0 };
9
10 sTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
11 convertToZoomed (out, mouse.x (), mouse.y (), &ax, &ay);
12@@ -1186,6 +1187,7 @@
13 glBindTexture (GL_TEXTURE_2D, cursor.texture);
14
15 streamingBuffer->begin (GL_TRIANGLE_STRIP);
16+ streamingBuffer->colorDefault ();
17
18 vertexData[0] = x;
19 vertexData[1] = y;
20@@ -1214,7 +1216,7 @@
21 streamingBuffer->addTexCoords (0, 4, textureData);
22
23 streamingBuffer->end ();
24- streamingBuffer->render (sTransform);
25+ streamingBuffer->render (sTransform, attrib);
26
27 glBindTexture (GL_TEXTURE_2D, 0);
28 glDisable (GL_BLEND);

Subscribers

People subscribed via source and target branches

to all changes: